Merge remote-tracking branch 'origin/sheep_develop' into sheep_develop

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

@@ -226,6 +226,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         public void handleMessage(Message msg) {
             super.handleMessage(msg);
             FgtTryMakeMoney item;
+            checkAndInitView();
             switch (msg.what) {
                 case WHAT_LOAD_USER_INFO:
                     loadUserInfo();
@@ -246,7 +247,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                         tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists));
                     }
                     tryMakeMoneyAdp.notifyDataSetChanged();
-                    checkAndInitView();
                     break;
                 case WHAT_UPDATE_VP_HEIGHT://刷新ViewPager高度
                     item = (FgtTryMakeMoney) adpViewPagerDetail.getItem(curPosition);
@@ -1120,6 +1120,10 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             home_list_gridview_layout = mContentView.findViewById(R.id.home_list_gridview_layout);
         if (home_list_gridview_listview == null)
             home_list_gridview_listview = mContentView.findViewById(R.id.home_list_gridview_listview);
+        if (bottom_line_text == null)
+            bottom_line_text = mContentView.findViewById(R.id.bottom_line_text);
+        if (mViewPager == null)
+            mViewPager = mContentView.findViewById(R.id.viewpager_act_game_details);
     }
 
     @Override

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

@@ -2065,4 +2065,61 @@ public class CommonUtil {
         }
 
     }
+    /**
+     * 玩转游戏 按钮设置
+     */
+    public void palyGameDetailBtnValue(final Context context, GameEntity gameEntity, TextView detail_task_tv_center){
+        final TaskReleaseEty releaseEty = gameEntity.getRelease_task();
+        final TaskEty taskEty = releaseEty != null?releaseEty.getTask():null;
+        if(releaseEty != null && taskEty != null){
+
+            if(taskEty.isGameReservationCantDownload()){//游戏任务中的预约任务，且不能下载情况下
+                detail_task_tv_center.setText("预约下载");
+                detail_task_tv_center.setEnabled(true);
+                detail_task_tv_center.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        CommonUtil.getInstance().reservationGameTask(context, releaseEty, new Action1<Integer>() {
+                            @Override
+                            public void call(Integer integer) {
+
+                            }
+                        });
+                    }
+                });
+            } else {
+                if (gameEntity.getReceived_voucher()) {//已领取
+                    if (gameEntity.getCan_download()) {
+                        releaseEty.getDownloadHelper().updateDownloadTaskView((Activity) context, taskEty, detail_task_tv_center);
+                        detail_task_tv_center.setTag("PUBLIC_TAG_PREFIX_TEXTVIEW_LIST" + taskEty.getDownload_link());
+                    } else {
+                        detail_task_tv_center.setEnabled(false);
+                        detail_task_tv_center.setText("已经预约");
+                    }
+
+                } else {
+                    detail_task_tv_center.setText("领取奖励");
+                    detail_task_tv_center.setEnabled(true);
+                    detail_task_tv_center.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            CommonUtil.getInstance().receiveAward(context, releaseEty, new Action1<Integer>() {
+                                @Override
+                                public void call(Integer integer) {
+
+                                }
+                            });
+                        }
+                    });
+                }
+            }
+        }else
+        if (gameEntity.getApp().isCanDonload()) {//可下载
+            gameEntity.getApp().getFindAppHelper().updateDownloadTaskView((Activity) context, gameEntity.getApp(), detail_task_tv_center);
+            detail_task_tv_center.setTag("PUBLIC_TAG_PREFIX_TEXTVIEW_LIST" + gameEntity.getApp().getDownload_link());
+        } else {//预约下载
+            gameEntity.getApp().getFindAppHelper().updateReservationView((Activity) context, gameEntity.getApp(), detail_task_tv_center);
+            detail_task_tv_center.setTag("PUBLIC_TAG_PREFIX_TEXTVIEW_LIST" + gameEntity.getApp().getDownload_link());
+        }
+    }
 }

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

@@ -34,12 +34,6 @@ public class ActGameCenter extends BaseActivity {
         activity = this;
         TitleBarUtils.getInstance()
                 .setTitleFinish(activity)
-                .setRightImgBotton(activity,  R.mipmap.search_black_img, new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        Jump2View.getInstance().goGameSearch(activity, null);
-                    }
-                })
                 .setRightSecondBtn(activity, R.mipmap.search_black_img, new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {

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

@@ -248,12 +248,14 @@ public class ActPlayGameDetail extends BaseActivity implements Action1<Integer>
         GlideImageLoader.setGameImage(find_game_iv, gameEntity.getApp().getIcon());
         ViewUtil.setText(find_game_name_tv, gameEntity.getApp().getName());
         isNeedReservation = !gameEntity.getApp().isCanDonload();//这里认为只有两种状态：可下载与预约下载
-        if (isNeedReservation)
-            ViewUtil.setText(find_game_info_tv, String.format(Locale.CHINA, "开放时间：%s", TimeUtil.TimeStamp2Date(gameEntity.getApp().getDownload_at(), "yyyy-MM-dd\u0020HH:mm")));
-        else {
-            String format = "包体大小 (%sM)";
-            ViewUtil.setText(find_game_info_tv, String.format(Locale.CHINA, format, gameEntity.getApp().getPackage_size()));
-        }
+//        if (isNeedReservation)
+//            ViewUtil.setText(find_game_info_tv, String.format(Locale.CHINA, "开放时间：%s", TimeUtil.TimeStamp2Date(gameEntity.getApp().getDownload_at(), "yyyy-MM-dd\u0020HH:mm")));
+//        else {
+//            String format = "包体大小 (%sM)";
+//            ViewUtil.setText(find_game_info_tv, String.format(Locale.CHINA, format, gameEntity.getApp().getPackage_size()));
+//        }
+        String format = "包体大小 (%sM)";
+        ViewUtil.setText(find_game_info_tv, String.format(Locale.CHINA, format, gameEntity.getApp().getPackage_size()));
 
         find_game_xin.setRating(gameEntity.getApp().getScore() / 2);
 
@@ -323,7 +325,7 @@ public class ActPlayGameDetail extends BaseActivity implements Action1<Integer>
                     }
 
                 } else {
-                    textView.setText("领取任务");
+                    textView.setText("领取奖励");
                     textView.setEnabled(true);
                     textView.setOnClickListener(new View.OnClickListener() {
                         @Override

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

@@ -58,7 +58,6 @@ public abstract class BaseListActivity<T> extends BaseActivity {
         getType();
         initView();
         initListener();
-        initData();
     }
 
     protected int page = 1;//页数

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

@@ -110,6 +110,7 @@ public class InvitationActivity extends AppCompatActivity implements ScalableCar
     private String url;
     private String description;
     private Bitmap mBitmap;
+    private File file;
     private List<PictureInvitationEntity> mPictureList = new ArrayList<>();
     private List<File> mPictureFileList = new ArrayList<>();
     private List<File> mRxFileList = new ArrayList<>();
@@ -203,7 +204,7 @@ public class InvitationActivity extends AppCompatActivity implements ScalableCar
                     @Override
                     public void onClick(View view) {
                         if (position == 1 || position == 2) {
-                            popShare(InvitationActivity.this, url, item, description, mBitmap);
+                            popShare(InvitationActivity.this, url, item, description, file);
                         } else {
                             popShare(InvitationActivity.this, url, item, description, null);
                         }
@@ -239,7 +240,7 @@ public class InvitationActivity extends AppCompatActivity implements ScalableCar
      * @param type        qq wx all
      * @param description
      */
-    public void popShare(Activity activity, final String url, @DialogShare.SHARE_TYPE String type, String description, Bitmap bitmap) {
+    public void popShare(Activity activity, final String url, @DialogShare.SHARE_TYPE String type, String description, File bitmap) {
         if (activity == null || TextUtils.isEmpty(type) || TextUtils.isEmpty(url)) {
             return;
         }
@@ -357,7 +358,12 @@ public class InvitationActivity extends AppCompatActivity implements ScalableCar
 
     @Override
     public void onPageSelected(int position) {
-        mBitmap=getViewBitmap(adapter.getView());
+        try {
+            mBitmap=getViewBitmap(mRecyclerView.getChildAt(position).findViewById(R.id.layout_view));
+            file=getViewFile(mRecyclerView.getChildAt(position).findViewById(R.id.layout_view));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         Log.i("aaaa", "当前位置" + position);
     }
 
@@ -466,7 +472,13 @@ public class InvitationActivity extends AppCompatActivity implements ScalableCar
         addViewContent.buildDrawingCache();
         Bitmap cacheBitmap = addViewContent.getDrawingCache();
         Bitmap bitmap = Bitmap.createBitmap(cacheBitmap);
-        return bitmap;
+        return ViewUtil.getCacheBitmapFromView((View) addViewContent.getParent());
+    }
+    private File getViewFile(View addViewContent) {
+        if (addViewContent==null){
+            return null;
+        }
+        return ViewUtil.saveImage(addViewContent, ClassFileHelper.DIR, System.currentTimeMillis() + ".jpg");
     }
 
 

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

@@ -291,29 +291,50 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
         });
     }
     private void bindWX() {
-        UMShareAPI.get(this).doOauthVerify(this, SHARE_MEDIA.WEIXIN, new UMAuthListener() {
+        UMShareAPI.get(this).deleteOauth(this, SHARE_MEDIA.WEIXIN, new UMAuthListener() {
             @Override
-            public void onStart(SHARE_MEDIA platform) {
-                showProgress();
+            public void onStart(SHARE_MEDIA share_media) {
+
             }
 
             @Override
-            public void onComplete(SHARE_MEDIA platform, int action, Map<String, String> data) {
-                bindThird("wechat", data.get("access_token"), data.get("openid"));
+            public void onComplete(SHARE_MEDIA share_media, int i, Map<String, String> map) {
+                UMShareAPI.get(activity).doOauthVerify(activity, SHARE_MEDIA.WEIXIN, new UMAuthListener() {
+                    @Override
+                    public void onStart(SHARE_MEDIA platform) {
+                        showProgress();
+                    }
+
+                    @Override
+                    public void onComplete(SHARE_MEDIA platform, int action, Map<String, String> data) {
+                        bindThird("wechat", data.get("access_token"), data.get("openid"));
+                    }
+
+                    @Override
+                    public void onError(SHARE_MEDIA platform, int action, Throwable t) {
+                        G.showToast("微信授权失败  请检查网络是否正常");
+                        hideProgress();
+                    }
+
+                    @Override
+                    public void onCancel(SHARE_MEDIA platform, int action) {
+                        G.showToast("您取消了微信授权");
+                        hideProgress();
+                    }
+                });
             }
 
             @Override
-            public void onError(SHARE_MEDIA platform, int action, Throwable t) {
-                G.showToast("微信授权失败  请检查网络是否正常");
-                hideProgress();
+            public void onError(SHARE_MEDIA share_media, int i, Throwable throwable) {
+
             }
 
             @Override
-            public void onCancel(SHARE_MEDIA platform, int action) {
-                G.showToast("您取消了微信授权");
-                hideProgress();
+            public void onCancel(SHARE_MEDIA share_media, int i) {
+
             }
         });
+
     }
 
     /**

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

@@ -22,6 +22,9 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
 import java.util.List;
 
 import butterknife.BindView;
@@ -62,8 +65,15 @@ public abstract class BaseListFragment<T> extends BaseFragment {
 
     protected int page = 1;//页数
     protected int per_page = 10;
+
+    @Subscribe
     public void initView() {
         title.setVisibility(View.GONE);
+        try {
+            EventBus.getDefault().register(this);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
     public void initListener() {
         view_list.setLoadingListener(new XRecyclerView.LoadingListener() {
@@ -153,6 +163,7 @@ public abstract class BaseListFragment<T> extends BaseFragment {
         }
         view_list.getAdapter().notifyDataSetChanged();
         notifyData();
+        view_list.getFootView().setVisibility(view_list.getAdapter().getItemCount() == 0?View.GONE : View.VISIBLE);
     }
     Unbinder unbinder;
     @Override
@@ -172,6 +183,7 @@ public abstract class BaseListFragment<T> extends BaseFragment {
             view_list.destroy(); // this will totally release XR's memory
             view_list = null;
         }
+        EventBus.getDefault().unregister(this);
     }
     public int getDataCount() {
         return list.size();

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

@@ -367,8 +367,8 @@ public class FgtPlayGame extends BaseFragment {
     private void initTab(){
         List<FindTag> newList = new ArrayList<>();
         newList.add(new FindTag(1002, "平台游戏"));
-        newList.add(new FindTag(1003, "小米游戏"));
-        newList.add(new FindTag(1004, "腾讯游戏"));
+        newList.add(new FindTag(1004, "小米游戏"));
+        newList.add(new FindTag(1003, "腾讯游戏"));
         newList.add(new FindTag(1099, "其他"));
         if (!ListUtil.isEmpty(newList)) {
             list.clear();

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

@@ -46,7 +46,6 @@ public class FgtPlayGameSon extends BaseListFragment<GameEntity> {
         if(bundle != null){
             type = bundle.getInt("type", 1002);
         }
-        EventBus.getDefault().register(this);
         return rootView;
     }
 
@@ -80,9 +79,4 @@ public class FgtPlayGameSon extends BaseListFragment<GameEntity> {
         CommonUtil.getInstance().setEventResultViewStatus(event, view_list);
     }
 
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        EventBus.getDefault().unregister(this);
-    }
 }

app/src/main/java/com/sheep/jiuyan/samllsheep/utils/TitleBarUtils.java

@@ -426,6 +426,9 @@ public class TitleBarUtils {
                                 }
                             });
                 }else {
+                    ImageButton secondImageButton = activity.findViewById(R.id.ibtn_two_right);
+
+                    secondImageButton.setVisibility(View.GONE);
                     setRightBotton(activity, "我的福利", 0, new View.OnClickListener() {
                         @Override
                         public void onClick(View v) {

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

@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="17dp"
         android:layout_marginTop="17dp"
-        android:text="关于小绵羊的优化建议？"
+        android:text=""
         android:textColor="#ff333333"
         android:textSize="18sp" />
 

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

@@ -1,232 +1,239 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white_light"
-    android:orientation="vertical">
-
-    <include layout="@layout/title" />
-
-
+    android:background="@color/bg_gray"
+    android:scrollbars="none">
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/content_padding_15"
-        android:layout_marginTop="@dimen/content_padding"
-        android:background="@color/white"
+        android:layout_height="match_parent"
+        android:background="@color/white_light"
         android:orientation="vertical">
+        <include layout="@layout/title" />
+
 
         <LinearLayout
-            android:id="@+id/personal_info_avatar_container"
-            style="@style/style_item_container">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/content_padding_15"
+            android:layout_marginTop="@dimen/content_padding"
+            android:background="@color/white"
+            android:orientation="vertical">
 
-            <TextView
-                style="@style/style_item_label"
-                android:text="@string/header" />
+            <LinearLayout
+                android:id="@+id/personal_info_avatar_container"
+                style="@style/style_item_container">
 
+                <TextView
+                    style="@style/style_item_label"
+                    android:text="@string/header" />
 
-            <ImageView
-                android:id="@+id/personal_info_avatar"
-                android:layout_width="33dp"
-                android:layout_height="33dp"
-                android:src="@mipmap/icon" />
 
-            <TextView style="@style/style_item_end_next" />
+                <ImageView
+                    android:id="@+id/personal_info_avatar"
+                    android:layout_width="33dp"
+                    android:layout_height="33dp"
+                    android:src="@mipmap/icon" />
 
+                <TextView style="@style/style_item_end_next" />
 
-        </LinearLayout>
 
-        <View style="@style/style_item_line_3_0" />
+            </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/personal_info_name_container"
-            style="@style/style_item_container">
+            <View style="@style/style_item_line_3_0" />
 
-            <TextView
-                style="@style/style_item_label"
-                android:text="@string/niker" />
+            <LinearLayout
+                android:id="@+id/personal_info_name_container"
+                style="@style/style_item_container">
 
+                <TextView
+                    style="@style/style_item_label"
+                    android:text="@string/niker" />
 
-            <TextView
-                android:id="@+id/personal_info_name"
-                style="@style/style_item_end_next" />
 
-        </LinearLayout>
+                <TextView
+                    android:id="@+id/personal_info_name"
+                    style="@style/style_item_end_next" />
 
-        <View style="@style/style_item_line_3_0" />
+            </LinearLayout>
 
-        <LinearLayout style="@style/style_item_container">
+            <View style="@style/style_item_line_3_0" />
 
-            <TextView
-                style="@style/style_item_label"
-                android:text="@string/sheep_id" />
+            <LinearLayout style="@style/style_item_container">
 
+                <TextView
+                    style="@style/style_item_label"
+                    android:text="@string/sheep_id" />
 
-            <TextView
-                android:id="@+id/personal_info_code"
-                style="@style/style_item_end_next"
-                android:textIsSelectable="true" />
 
-        </LinearLayout>
+                <TextView
+                    android:id="@+id/personal_info_code"
+                    style="@style/style_item_end_next"
+                    android:textIsSelectable="true" />
 
-        <View style="@style/style_item_line_3_0" />
+            </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/llayout_sex"
-            style="@style/style_item_container">
+            <View style="@style/style_item_line_3_0" />
 
-            <TextView
-                style="@style/style_item_label"
-                android:text="@string/sex" />
+            <LinearLayout
+                android:id="@+id/llayout_sex"
+                style="@style/style_item_container">
 
+                <TextView
+                    style="@style/style_item_label"
+                    android:text="@string/sex" />
 
-            <TextView
-                android:id="@+id/tv_sex"
-                style="@style/style_item_end_next"
-                android:layout_width="150dp"/>
 
-        </LinearLayout>
+                <TextView
+                    android:id="@+id/tv_sex"
+                    style="@style/style_item_end_next"
+                    android:layout_width="150dp"/>
 
-        <View style="@style/style_item_line_3_0" />
+            </LinearLayout>
 
-        <LinearLayout style="@style/style_item_container"
-            android:id="@+id/llayout_birthday">
+            <View style="@style/style_item_line_3_0" />
 
-            <TextView
-                style="@style/style_item_label"
-                android:text="@string/birth_day" />
+            <LinearLayout style="@style/style_item_container"
+                android:id="@+id/llayout_birthday">
 
+                <TextView
+                    style="@style/style_item_label"
+                    android:text="@string/birth_day" />
 
-            <TextView
-                android:id="@+id/tv_birthday"
-                style="@style/style_item_end_next" />
 
-        </LinearLayout>
+                <TextView
+                    android:id="@+id/tv_birthday"
+                    style="@style/style_item_end_next" />
 
-        <View style="@style/style_item_line_3_0" />
+            </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/personal_info_qr_container"
-            style="@style/style_item_container">
+            <View style="@style/style_item_line_3_0" />
 
-            <TextView
-                style="@style/style_item_label"
-                android:text="@string/my_qr" />
+            <LinearLayout
+                android:id="@+id/personal_info_qr_container"
+                style="@style/style_item_container">
 
-            <RelativeLayout
-                android:layout_width="30dp"
-                android:layout_height="30dp">
+                <TextView
+                    style="@style/style_item_label"
+                    android:text="@string/my_qr" />
 
-                <ImageView
-                    android:id="@+id/personal_info_qr"
-                    android:layout_width="25dp"
-                    android:layout_height="25dp"
-                    android:layout_centerInParent="true"
-                    android:background="@null"
-                    android:src="@mipmap/icon" />
+                <RelativeLayout
+                    android:layout_width="30dp"
+                    android:layout_height="30dp">
 
-                <ImageView
-                    android:layout_width="5dp"
-                    android:layout_height="5dp"
-                    android:layout_centerInParent="true"
-                    android:background="@null"
-                    android:src="@mipmap/icon" />
+                    <ImageView
+                        android:id="@+id/personal_info_qr"
+                        android:layout_width="25dp"
+                        android:layout_height="25dp"
+                        android:layout_centerInParent="true"
+                        android:background="@null"
+                        android:src="@mipmap/icon" />
 
-            </RelativeLayout>
+                    <ImageView
+                        android:layout_width="5dp"
+                        android:layout_height="5dp"
+                        android:layout_centerInParent="true"
+                        android:background="@null"
+                        android:src="@mipmap/icon" />
 
-            <TextView style="@style/style_item_end_next" />
+                </RelativeLayout>
 
-        </LinearLayout>
-    </LinearLayout>
+                <TextView style="@style/style_item_end_next" />
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/content_padding_15"
-        android:layout_marginTop="@dimen/content_padding"
-        android:background="@color/white"
-        android:orientation="vertical">
+            </LinearLayout>
+        </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/personal_info_phone_container"
-            style="@style/style_item_container">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/content_padding_15"
+            android:layout_marginTop="@dimen/content_padding"
+            android:background="@color/white"
+            android:orientation="vertical">
 
-            <TextView
-                style="@style/style_item_label"
-                android:text="@string/phone" />
+            <LinearLayout
+                android:id="@+id/personal_info_phone_container"
+                style="@style/style_item_container">
 
+                <TextView
+                    style="@style/style_item_label"
+                    android:text="@string/phone" />
 
-            <TextView
-                android:id="@+id/personal_info_phone"
-                style="@style/style_item_end_next" />
-        </LinearLayout>
 
-        <View style="@style/style_item_line_3_0" />
+                <TextView
+                    android:id="@+id/personal_info_phone"
+                    style="@style/style_item_end_next" />
+            </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/personal_info_bind_tx_wx_container"
-            style="@style/style_item_container">
+            <View style="@style/style_item_line_3_0" />
 
-            <TextView
-                style="@style/style_item_label"
-                android:text="@string/bind_tx_wx" />
+            <LinearLayout
+                android:id="@+id/personal_info_bind_tx_wx_container"
+                style="@style/style_item_container">
 
+                <TextView
+                    style="@style/style_item_label"
+                    android:text="@string/bind_tx_wx" />
 
-            <TextView
-                android:id="@+id/personal_info_bind_tx_wx"
-                style="@style/style_item_end_next" />
-        </LinearLayout>
 
-        <View style="@style/style_item_line_3_0" />
+                <TextView
+                    android:id="@+id/personal_info_bind_tx_wx"
+                    style="@style/style_item_end_next" />
+            </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/personal_info_bind_qq_container"
-            style="@style/style_item_container">
+            <View style="@style/style_item_line_3_0" />
 
-            <TextView
-                style="@style/style_item_label"
-                android:text="@string/bind_qq" />
+            <LinearLayout
+                android:id="@+id/personal_info_bind_qq_container"
+                style="@style/style_item_container">
 
+                <TextView
+                    style="@style/style_item_label"
+                    android:text="@string/bind_qq" />
 
-            <TextView
-                android:id="@+id/personal_info_bind_qq"
-                style="@style/style_item_end_next" />
-        </LinearLayout>
-        <View style="@style/style_item_line_3_0" />
 
-        <LinearLayout
-            android:id="@+id/personal_info_bind_wx_container"
-            style="@style/style_item_container">
+                <TextView
+                    android:id="@+id/personal_info_bind_qq"
+                    style="@style/style_item_end_next" />
+            </LinearLayout>
+            <View style="@style/style_item_line_3_0" />
 
-            <TextView
-                style="@style/style_item_label"
-                android:text="@string/bind_wx" />
+            <LinearLayout
+                android:id="@+id/personal_info_bind_wx_container"
+                style="@style/style_item_container">
 
+                <TextView
+                    style="@style/style_item_label"
+                    android:text="@string/bind_wx" />
 
-            <TextView
-                android:id="@+id/personal_info_bind_wx"
-                style="@style/style_item_end_next" />
-        </LinearLayout>
 
+                <TextView
+                    android:id="@+id/personal_info_bind_wx"
+                    style="@style/style_item_end_next" />
+            </LinearLayout>
 
-        <View style="@style/style_item_line_3_0" />
 
-        <LinearLayout
-            android:id="@+id/personal_info_authentication_container"
-            style="@style/style_item_container">
+            <View style="@style/style_item_line_3_0" />
 
-            <TextView
-                style="@style/style_item_label"
-                android:text="@string/auther" />
+            <LinearLayout
+                android:id="@+id/personal_info_authentication_container"
+                style="@style/style_item_container">
 
+                <TextView
+                    style="@style/style_item_label"
+                    android:text="@string/auther" />
 
-            <TextView
-                android:id="@+id/personal_info_authentication"
-                style="@style/style_item_end_next"
-                android:text="未认证" />
-        </LinearLayout>
 
+                <TextView
+                    android:id="@+id/personal_info_authentication"
+                    style="@style/style_item_end_next"
+                    android:text="未认证" />
+            </LinearLayout>
 
+
+        </LinearLayout>
     </LinearLayout>
 
-</LinearLayout>
+
+
+</ScrollView>