登录验证需求修改、发现优化、邀请赚钱修改、bug修改

app/src/main/AndroidManifest.xml

@@ -608,7 +608,9 @@
 
         <activity android:name="com.sheep.gamegroup.view.activity.ActMiDong"
             android:screenOrientation="portrait"/>
-        <activity android:name="com.sheep.gamegroup.view.activity.GameCertificationActivity" />
+        <activity android:name="com.sheep.gamegroup.view.activity.GameCertificationActivity"
+            android:exported="true"
+            android:screenOrientation="portrait"/>
 
         <service
             android:name="com.mdad.sdk.mdsdk.monitor.MonitorService"

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

@@ -989,6 +989,6 @@ public interface ApiService {
      * 请求授权
      * @return
      */
-    @GET("v1/sdk/{id}")
+    @GET("app/sdk/{game_key}")
     Observable<BaseMessage> verifactionAuth(@Path("game_key") String game_key);
 }

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

@@ -1,5 +1,7 @@
 package com.sheep.gamegroup.presenter;
 
+import android.text.TextUtils;
+
 import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;

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

@@ -1,10 +1,12 @@
 package com.sheep.gamegroup.util;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Handler;
 import android.os.Looper;
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
@@ -39,9 +41,11 @@ public class CertificationUtil {
         new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
             @Override
             public void run() {
+                SheepApp.getInstance().setGamePackgeName("");
+                SheepApp.getInstance().setGameCode("");
                 G.showToast(errorMsg);
                 SheepApp.getInstance().quit();
-                android.os.Process.killProcess(android.os.Process.myPid());
+//                android.os.Process.killProcess(android.os.Process.myPid());
                 System.exit(0);
             }
         }, skip_time);
@@ -51,8 +55,9 @@ public class CertificationUtil {
      */
     public void doCertification(Context context, String packgeName, String ext){
         try {
+            Log.e("game_-packgename---"+packgeName,"");
             Intent intent = new Intent();
-            intent.setClassName(context.getString(R.string.kfzs_duanduan_datashare_package_name), packgeName);
+            intent.setClassName(packgeName, "com.kfzs.duanduan.data.observer.helper.WhistleActivity");
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             intent.putExtra(context.getString(R.string.kfzs_duanduan_datashare_certification_key), SheepApp.getInstance().getGameCode());
 
@@ -65,6 +70,8 @@ public class CertificationUtil {
             showCertificationErrorAndExitApp("", 100);
         } catch (Exception e) {
             e.printStackTrace();
+            LogUtil.logE("game_-packgename---认证失败");
+            Log.e("game_-packgename---认证失败"+packgeName,"");
             showCertificationErrorAndExitApp("认证失败", 100);
         }
     }
@@ -72,23 +79,27 @@ public class CertificationUtil {
      *验证获取数据
      */
     public void authCerticicationCode(final Context context){
+        ViewUtil.newInstance().showProgress((Activity) context);
         SheepApp.getInstance().getNetComponent().getApiService().verifactionAuth(SheepApp.getInstance().getGameCode())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
+                        ViewUtil.newInstance().hideProgress((Activity) context);
                         if(baseMessage != null && baseMessage.getData() != null){
-                            doCertification(context, SheepApp.getInstance().getGamePackgeName(), (String) baseMessage.getData());
+                            Log.e("data-------","");
+                            doCertification(context, SheepApp.getInstance().getGamePackgeName(), baseMessage.getData()+"");
                         }else {
-                            CertificationUtil.newInstance().showCertificationErrorAndExitApp("请求授权错误 " + baseMessage.getMsg(),100);
+                            CertificationUtil.newInstance().showCertificationErrorAndExitApp("请求授权错误 " + baseMessage.getMsg(),1000);
                         }
 
                     }
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        CertificationUtil.newInstance().showCertificationErrorAndExitApp("请求授权错误 " + baseMessage.getMsg(),100);
+                        ViewUtil.newInstance().hideProgress((Activity) context);
+                        CertificationUtil.newInstance().showCertificationErrorAndExitApp("请求授权错误 " + baseMessage.getMsg(),1000);
                     }
                 });
     }

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

@@ -43,6 +43,7 @@ import com.sheep.gamegroup.model.entity.GameEntity;
 import com.sheep.gamegroup.model.entity.GiftBagApp;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
 import com.sheep.gamegroup.model.entity.PlayGameEntity;
+import com.sheep.gamegroup.model.entity.RobTask;
 import com.sheep.gamegroup.model.entity.RouserArticlesEntity;
 import com.sheep.gamegroup.model.entity.SlideshowEty;
 import com.sheep.gamegroup.model.entity.TaskChild;
@@ -102,6 +103,7 @@ import static com.sheep.gamegroup.util.UMConfigUtils.Event.NEWBIE_TASK;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.QR_COPY;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.RECEIVE_AWARD_GAME_TASK;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.XIAOMI_GAME_RECEIVE;
+import static com.sheep.gamegroup.util.ViewUtil.mRobTask;
 import static com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp.PUBLIC_TAG_PREFIX_TEXTVIEW_LIST;
 import static com.sheep.gamegroup.view.adapter.WelfareAdapter.TO_REFRESH;
 
@@ -2227,4 +2229,28 @@ public class CommonUtil {
         }
         return true;
     }
+    /**
+     * 抢任务
+     */
+    public void robTask(final Action1<RobTask> action1){
+        SheepApp.getInstance().getNetComponent().getApiService().getNewTask(SpUtils.getOrder("order"))
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        if(action1 != null){
+                            mRobTask = baseMessage.getData(RobTask.class);
+                            action1.call(mRobTask);
+                        }
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        if(action1 != null){
+                            action1.call(null);
+                        }
+                    }
+                });
+    }
 }

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

@@ -213,8 +213,11 @@ public class Jump2View {
     public synchronized void goLoginView(Context context, String o){
         Intent intent = new Intent(context, LoginAct.class);
         intent.putExtra("where_from", o);
-        if(!(context instanceof Activity))
+        if(!(context instanceof Activity)){
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        }else if(!TextUtils.isEmpty(o)){
+            ((Activity) context).finish();
+        }
         context.startActivity(intent);
     }
 

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

@@ -209,27 +209,24 @@ public class ViewUtil {
      */
     public static RobTask getTask(final ImageView ivIcon, final TextView tvTitel, final TextView tvDutyMoney) {
         LogUtil.logI(SpUtils.getOrder("order") + "开始的order");
-        SheepApp.getInstance().getNetComponent().getApiService().getNewTask(SpUtils.getOrder("order"))
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        try {
-                            mRobTask = baseMessage.getData(RobTask.class);
-                            SpUtils.saveOrder("order", mRobTask.getOrder());
-                            tvDutyMoney.setText(mRobTask.getM().getBonus() + "元");//设置任务奖励金额
-                            tvTitel.setText(mRobTask.getM().getTask().getTask_name());//设置任务名字
-                            GlideImageLoader.setImage(ivIcon, mRobTask.getM().getTask().getIcon());//设置任务图标
-                        } catch (Exception e) {
-                        }
-                    }
 
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        G.showToast(baseMessage);
+        CommonUtil.getInstance().robTask(new Action1<RobTask>() {
+            @Override
+            public void call(RobTask robTask) {
+                if(robTask != null){
+                    try {
+                        mRobTask = robTask;
+                        SpUtils.saveOrder("order", mRobTask.getOrder());
+                        tvDutyMoney.setText("+"+mRobTask.getM().getBonus() + "元");//设置任务奖励金额
+                        tvTitel.setText(mRobTask.getM().getTask().getTask_name());//设置任务名字
+                        GlideImageLoader.setImage(ivIcon, mRobTask.getM().getTask().getIcon());//设置任务图标
+                    } catch (Exception e) {
                     }
-                });
+                }else {
+                    G.showToast("任务已被抢光！请实时关注任务发布！");
+                }
+            }
+        });
         return mRobTask;
     }
 

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

@@ -13,6 +13,7 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.LoginEntity;
 import com.sheep.gamegroup.model.util.EntityUtils;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.util.CertificationUtil;
 import com.sheep.gamegroup.util.ChannelContent;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
@@ -190,7 +191,11 @@ public class ActBindMobileRegister extends BaseActivity {
                             SpUtils.saveToken(activity, loginEty.getToken());
                             DataUtil.getInstance().setUserEntity(loginEty.getUser());
                         }
-                        Jump2View.getInstance().goHomePageView(activity, EntityUtils.getUserCode(loginEty));
+                        if(TextUtils.isEmpty(SheepApp.getInstance().getGameCode())){
+                            Jump2View.getInstance().goHomePageView(activity, EntityUtils.getUserCode(loginEty));
+                        }else {
+                            CertificationUtil.newInstance().authCerticicationCode(activity);
+                        }
                         TestUtil.saveUser(loginEty);
                     }
 

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

@@ -2,6 +2,7 @@ package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.os.Handler;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
@@ -10,16 +11,20 @@ import android.widget.TextView;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.util.CertificationUtil;
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
+import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.view.customview.TextProgressBar;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import rx.functions.Action1;
 
 /**
  * 认证登录界面
@@ -28,25 +33,27 @@ import butterknife.OnClick;
 
 public class GameCertificationActivity extends BaseActivity {
 
-    public static final long SKIP_TIME = 3000;
-
     @BindView(R.id.icon_iv)
-    ImageView iconIv;
+    ImageView icon_iv;
     @BindView(R.id.app_name_tv)
-    TextView appNameTv;
+    TextView app_name_tv;
     @BindView(R.id.name_tv)
-    TextView nameTv;
+    TextView name_tv;
     @BindView(R.id.invite_num_tv)
-    TextView inviteNumTv;
+    TextView invite_num_tv;
     @BindView(R.id.user_icon_iv)
-    ImageView userIconIv;
+    ImageView user_icon_iv;
     @BindView(R.id.change_account_tv)
-    TextView changeAccountTv;
+    TextView change_account_tv;
+    @BindView(R.id.empty_view)
+    View empty_view;
 
     private Activity activity;
     private Bundle extras;
+    private  UserEntity userEntity;
     private String packgeName;
     private TextProgressBar textProgressBar;
+    private boolean isChangeAccount;
 
     @Override
     protected int getLayoutId() {
@@ -55,18 +62,22 @@ public class GameCertificationActivity extends BaseActivity {
 
     @Override
     public void initView() {
+        activity = this;
         textProgressBar = new TextProgressBar(activity);
         textProgressBar.setVisibility(View.VISIBLE);
+        TitleBarUtils.getInstance().setTitle(activity, "授权登录")
+                .setTitleListen(activity, 0, null);
 
     }
 
     public void initData() {
         extras = getIntent().getExtras();
-        UserEntity userEntity = DataUtil.getInstance().getUserEntity();
+        userEntity = DataUtil.getInstance().getUserEntity();
 
         if (extras != null) {
             SheepApp.getInstance().setGameCode(extras.getString(getString(R.string.kfzs_duanduan_datashare_game_code), ""));
             packgeName = extras.getString(getString(R.string.kfzs_duanduan_datashare_package_name), "");
+            SheepApp.getInstance().setGamePackgeName(packgeName);
             if(TextUtils.isEmpty(SheepApp.getInstance().getGameCode()) || TextUtils.isEmpty(packgeName)){
                 CertificationUtil.newInstance().showCertificationErrorAndExitApp("",2000);
                 return;
@@ -91,6 +102,8 @@ public class GameCertificationActivity extends BaseActivity {
                 textProgressBar.setVisibility(View.GONE);
                 break;
             case R.id.change_account_tv:
+                isChangeAccount = true;
+                Jump2View.getInstance().goLoginView(activity,SheepApp.getInstance().getGameCode());
                 break;
         }
     }
@@ -103,7 +116,37 @@ public class GameCertificationActivity extends BaseActivity {
         if(TextUtils.isEmpty(token)){
             Jump2View.getInstance().goLoginView(activity,SheepApp.getInstance().getGameCode());
         }else {
-            CertificationUtil.newInstance().authCerticicationCode(activity);
+            if(userEntity == null){
+                CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
+                    @Override
+                    public void call(UserEntity userEntity) {
+                        if(userEntity == null){
+                            Jump2View.getInstance().goLoginView(activity,SheepApp.getInstance().getGameCode());
+                        }else {
+                            initWidget();
+                        }
+                    }
+                });
+            }else {
+                initWidget();
+            }
+
         }
     }
+    /**
+     * 赋值
+     */
+    private void initWidget(){
+        empty_view.setVisibility(View.GONE);
+        name_tv.setText(userEntity.getNickname());
+        invite_num_tv.setText(userEntity.getInvitation_code()+"");
+        GlideImageLoader.setAvatar(user_icon_iv, userEntity.getAvatar());
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                if(!isChangeAccount)
+                    CertificationUtil.newInstance().authCerticicationCode(activity);
+            }
+        },3000);
+    }
 }

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

@@ -90,7 +90,6 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
     TextView testChange;
     @BindView(R.id.test_change_user)
     TextView testChangeUser;
-    private String where_from ;
 
 
     @Override
@@ -108,7 +107,6 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
                 .inject(this);
         TestUtil.testChange(this, (TextView) findViewById(R.id.test_change));
         TestUtil.testChangeUser(this, (TextView) findViewById(R.id.test_change_user));
-        where_from = getIntent().getStringExtra("where_from");
         if(DataUtil.是官方包吗()){
             loginEtScope.setVisibility(View.GONE);
         } else {
@@ -263,7 +261,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
     public void NetSuccess(int code, String msg, String invitation_code) {
         G.showToast(msg);
         hideProgress();
-        if(TextUtils.isEmpty(where_from)){
+        if(TextUtils.isEmpty(SheepApp.getInstance().getGameCode())){
             Jump2View.getInstance().goHomePageView(this, invitation_code);
         }else {
             CertificationUtil.newInstance().authCerticicationCode(activity);
@@ -368,7 +366,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
                             DataUtil.getInstance().setUserEntity(loginEty.getUser());
                         }
 
-                        if(TextUtils.isEmpty(where_from)){
+                        if(TextUtils.isEmpty(SheepApp.getInstance().getGameCode())){
                             Jump2View.getInstance().goHomePageView(activity, EntityUtils.getUserCode(loginEty));
                         }else {
                             CertificationUtil.newInstance().authCerticicationCode(activity);

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

@@ -84,21 +84,6 @@ public class SignRankingsAct extends BaseActivity {
     }
 
 
-    @OnClick({R.id.sign_rl_ljdl, R.id.sign_rl_lxdl})
-    public void onViewClicked(View view) {
-        switch (view.getId()) {
-            case R.id.sign_rl_ljdl:
-                signViewPager.setCurrentItem(0);
-                selectLeft();
-
-                break;
-            case R.id.sign_rl_lxdl:
-                signViewPager.setCurrentItem(1);
-                selectRight();
-                break;
-        }
-    }
-
     private void selectLeft() {
         UMConfigUtils.Event.PUNCH_ACCUMULATIVE_LIST.onEvent();
     }

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

@@ -25,6 +25,10 @@ public class TitleFragmentListAdapter extends FragmentPagerAdapter {
         mListFragment.add(fragment);
         mTitles.add(title);
     }
+    public void add(Fragment fragment, String title, int index) {
+        mListFragment.add(index, fragment);
+        mTitles.add(index, title);
+    }
 
     public void clearData(){
         mListFragment.clear();

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

@@ -142,7 +142,7 @@ public class FgtAskgetmoney extends BaseFragment {
 //                "</html>";
 //        ask_bg.getSettings().setDefaultTextEncodingName("UTF-8");
 //        ask_bg.loadData(content, "text/html", "UTF-8");
-        GlideImageLoader.setImage(ask_bg, "http://cdngame.kuaifazs.com/yaoqingzq_bg.png");
+        GlideImageLoader.setImage(ask_bg, "http://cdngame.kuaifazs.com/yaoqingzq2_bg.png");
 //                16,18,19
         LinearLayout.LayoutParams layoutParams1 = (LinearLayout.LayoutParams) ask_top_1.getLayoutParams();
         layoutParams1.height = G.WIDTH * 560 / 625;

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

@@ -130,14 +130,14 @@ public class FgtFind extends BaseFragment {
                 public void call(String url) {
                     int awaken_on = NumberFormatUtils.parseInteger(url);
                     int count = 1;
-                    if (awaken_on == 1) {
-                        count++;
-                        mAdapter.add(new FgtRouser(), "看点");
-                    }
                     for (FindTag findLabel : list) {
                         mAdapter.add(FgtFindChild.newInstance(findLabel.getId()), findLabel.getName());
                         count++;
                     }
+                    if (awaken_on == 1) {
+                        count++;
+                        mAdapter.add(new FgtRouser(), "看点", 2);
+                    }
                     pager.setAdapter(mAdapter);
                     indicator.setupWithViewPager(pager);
                     pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {

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

@@ -281,6 +281,12 @@ public class FgtRouser extends BaseFragment {
                         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.awakenApp());
                         if(isNewData) {
                             List<RouserArticlesEntity> newList = baseMessage.getDatas(RouserArticlesEntity.class);
+                            for(RouserArticlesEntity r: newList){
+                                boolean isInstalled = PackageUtil.isAppInstalled(SheepApp.getInstance(), r.getPackage_name());
+                                if(!isInstalled){
+                                    newList.remove(r);
+                                }
+                            }
                             loadList(newList);
                         }
                     }

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

@@ -42,6 +42,7 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.google.gson.Gson;
 import com.sheep.gamegroup.event.BigEvent;
+import com.sheep.gamegroup.model.entity.RobTask;
 import com.sheep.gamegroup.util.ConfigUtil;
 import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.sheep.gamegroup.di.components.DaggerSmallSheepComponent;
@@ -943,7 +944,16 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
                 Jump2View.getInstance().goRechargeAct(activity, "首页");
                 break;
             case R.id.view_rob_duty://抢任务弹框
-                ViewUtil.showRobDutyDialog(getActivity(), getView());
+                CommonUtil.getInstance().robTask(new Action1<RobTask>() {
+                    @Override
+                    public void call(RobTask robTask) {
+                        if(robTask != null){
+                            ViewUtil.showRobDutyDialog(getActivity(), getView());
+                        }else {
+                            G.showToast("任务已被抢光！请实时关注任务发布！");
+                        }
+                    }
+                });
                 break;
             case R.id.bottom_line://我是有底线的，双击我回到顶部
                 scrollView.fullScroll(NestedScrollView.FOCUS_UP);

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

@@ -7,81 +7,140 @@
 
     <include
         layout="@layout/title"/>
-
-    <android.support.constraint.ConstraintLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <ImageView
-            android:id="@+id/icon_iv"
-            android:layout_width="@dimen/view_size_90"
-            android:layout_height="@dimen/view_size_90"
-            android:src="@mipmap/icon"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toTopOf="@+id/app_name_tv"
-            android:layout_marginBottom="@dimen/content_padding_9"/>
+        android:layout_height="match_parent"
+        android:scrollbars="none">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+            <include
+                android:id="@+id/empty_view"
+                layout="@layout/empty_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_below="@+id/check_net_ll"
+                android:visibility="gone"/>
+
+            <android.support.constraint.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/white"
+                android:layout_marginTop="@dimen/content_padding_30"
+                android:paddingBottom="@dimen/content_padding_15">
+                <ImageView
+                    android:id="@+id/icon_iv"
+                    android:layout_width="@dimen/view_size_90"
+                    android:layout_height="@dimen/view_size_90"
+                    android:src="@mipmap/icon"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintBottom_toTopOf="@+id/app_name_tv"
+                    android:layout_marginBottom="@dimen/content_padding_9"/>
+
+                <TextView
+                    android:id="@+id/app_name_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="小绵羊授权登录"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    android:textSize="@dimen/text_size_16"
+                    android:textColor="@color/black"
+                    app:layout_constraintBottom_toTopOf="@+id/user_icon_iv"
+                    android:layout_marginBottom="@dimen/content_padding_40"/>
+
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/name_tv"
+                    android:text=""
+                    style="@style/txt_style_15_black"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="@+id/user_icon_iv"
+                    android:layout_marginLeft="@dimen/content_padding_30"
+                    android:layout_marginTop="@dimen/content_padding_5"/>
 
-        <TextView
-            android:id="@+id/app_name_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="小绵羊授权登录"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:textSize="@dimen/text_size_16"
-            android:textColor="@color/black"
-            app:layout_constraintBottom_toTopOf="@+id/user_icon_iv"
-            android:layout_marginBottom="@dimen/content_padding_40"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/invite_num_tv"
+                    android:text=""
+                    style="@style/txt_style_15_black"
+                    app:layout_constraintBottom_toBottomOf="@+id/user_icon_iv"
+                    app:layout_constraintStart_toStartOf="parent"
+                    android:layout_marginLeft="@dimen/content_padding_30"
+                    android:layout_marginBottom="@dimen/content_padding_5"/>
 
+                <ImageView
+                    android:id="@+id/user_icon_iv"
+                    android:layout_width="55dp"
+                    android:layout_height="55dp"
+                    android:src="@mipmap/icon"
+                    android:layout_alignParentRight="true"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    android:layout_marginRight="@dimen/content_padding_30"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    android:paddingTop="@dimen/content_padding_3"/>
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/name_tv"
-            android:text="小绵羊"
-            style="@style/txt_style_15_black"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/user_icon_iv"
-            android:layout_marginLeft="@dimen/content_padding_20"
-            android:layout_marginTop="@dimen/content_padding_5"/>
+                <View
+                    android:id="@+id/bottom_uer_line"
+                    android:layout_width="match_parent"
+                    android:layout_height="1px"
+                    android:background="@color/gray_5"
+                    app:layout_constraintTop_toBottomOf="@+id/user_icon_iv"
+                    android:layout_marginTop="@dimen/content_padding_5"/>
+                <View
+                    android:id="@+id/top_uer_line"
+                    android:layout_width="match_parent"
+                    android:layout_height="1px"
+                    android:background="@color/gray_5"
+                    app:layout_constraintBottom_toTopOf="@+id/user_icon_iv"
+                    android:layout_marginBottom="@dimen/content_padding_5"/>
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/invite_num_tv"
-            android:text="小绵羊"
-            style="@style/txt_style_15_black"
-            app:layout_constraintBottom_toBottomOf="@+id/user_icon_iv"
-            app:layout_constraintStart_toStartOf="parent"
-            android:layout_marginLeft="@dimen/content_padding_20"
-            android:layout_marginBottom="@dimen/content_padding_5"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/change_account_tv"
+                    android:text="账号登录"
+                    style="@style/txt_style_15_black"
+                    app:layout_constraintStart_toStartOf="parent"
+                    android:layout_marginLeft="@dimen/content_padding_30"
+                    android:layout_marginBottom="@dimen/content_padding_5"
+                    android:textColor="#36A5ED"
+                    android:textSize="18sp"
+                    app:layout_constraintTop_toBottomOf="@+id/user_icon_iv"
+                    android:layout_marginTop="@dimen/content_padding_20"/>
 
-        <ImageView
-            android:id="@+id/user_icon_iv"
-            android:layout_width="55dp"
-            android:layout_height="55dp"
-            android:src="@mipmap/icon"
-            android:layout_alignParentRight="true"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            android:layout_marginRight="@dimen/content_padding_20"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:paddingTop="@dimen/content_padding_3"/>
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/change_account_tv"
-            android:text="账号登录"
-            style="@style/txt_style_15_black"
-            app:layout_constraintStart_toStartOf="parent"
-            android:layout_marginLeft="@dimen/content_padding_20"
-            android:layout_marginBottom="@dimen/content_padding_5"
-            android:textColor="#36A5ED"
-            android:textSize="18sp"
-            app:layout_constraintTop_toBottomOf="@+id/user_icon_iv"
-            android:layout_marginTop="@dimen/content_padding_20"/>
+                <com.github.ybq.android.spinkit.SpinKitView
+                    android:id="@+id/loading_view_img"
+                    style="@style/SpinKitView.Large.ThreeBounce"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:SpinKit_Color="@color/colorAccent"
+                    android:layout_marginTop="@dimen/content_padding_20"
+                    app:layout_constraintTop_toBottomOf="@+id/change_account_tv"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"/>
+                <TextView
+                    android:id="@+id/loading_view_msg"
+                    style="@style/style_empty_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="@dimen/content_padding_8"
+                    android:text="登录授权认证中..."
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/loading_view_img"
+                    android:layout_marginBottom="@dimen/content_padding_15"/>
+            </android.support.constraint.ConstraintLayout>
+        </LinearLayout>
+    </ScrollView>
 
-    </android.support.constraint.ConstraintLayout>
 
 </LinearLayout>