删除top.zibin:Luban库相关的一些java与资源文件

app/build.gradle

@@ -227,7 +227,6 @@ dependencies {
     compile 'com.kf.framework:volleyplus:1.4.5@aar'
     compile 'com.android.support:support-annotations:27.0.2'
     compile 'com.android.support:recyclerview-v7:27.0.2'
-//    compile 'top.zibin:Luban:1.0.9'
     compile project(':datashare')
     compile files('libs/jackson-core-2.2.1.jar')
     compile files('libs/jackson-dataformat-xml-2.1.2.jar')

app/src/main/AndroidManifest.xml

@@ -270,15 +270,9 @@
             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
@@ -304,19 +298,6 @@
             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"

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/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/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;
@@ -541,8 +537,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();

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/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/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/utils/dlg/SkipUtils.java

@@ -10,7 +10,6 @@ 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;
@@ -169,19 +168,6 @@ public class SkipUtils {
         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);
-        }
-    }
-
-
     /**
      * 跳指定游戏详情页的论坛页面
      *

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

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.flipboard.bottomsheet.BottomSheetLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/bottom_sheet_layout_act_user"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    tools:context="com.kfzs.duanduan.ActUser">
+    android:fitsSystemWindows="true">
 
     <android.support.design.widget.CoordinatorLayout
         android:layout_width="match_parent"

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

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.flipboard.bottomsheet.BottomSheetLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/bottom_sheet_layout_act_user"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
-
-    <android.support.design.widget.CoordinatorLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <android.support.design.widget.AppBarLayout
-            android:id="@+id/appbar_user"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/detail_backdrop_height"
-            android:fitsSystemWindows="true">
-
-            <android.support.design.widget.CollapsingToolbarLayout
-                android:id="@+id/collapsing_toolbar_user"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:fitsSystemWindows="true"
-                app:collapsedTitleGravity="center"
-                app:expandedTitleGravity="center"
-                app:contentScrim="?attr/main_color"
-                app:expandedTitleTextAppearance="@android:color/transparent"
-                app:layout_scrollFlags="scroll|exitUntilCollapsed"
-                app:statusBarScrim="@android:color/transparent">
-
-                <include layout="@layout/include_app_bar_user" />
-
-                <android.support.v7.widget.Toolbar
-                    app:contentInsetLeft="0dp"
-                    app:contentInsetStart="0dp"
-                    android:id="@+id/toolbar_user"
-                    app:titleTextColor="@color/white"
-                    android:layout_width="match_parent"
-                    android:layout_height="?attr/actionBarSize"
-                    android:background="@android:color/transparent"
-                    app:layout_collapseMode="pin"/>
-
-
-            </android.support.design.widget.CollapsingToolbarLayout>
-
-
-        </android.support.design.widget.AppBarLayout>
-
-        <include layout="@layout/content_user" />
-
-    </android.support.design.widget.CoordinatorLayout>
-
-
-</com.flipboard.bottomsheet.BottomSheetLayout>

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

@@ -6,7 +6,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="com.kfzs.duanduan.ActUser"
     tools:showIn="@layout/activity_user">
 
     <FrameLayout

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

@@ -1,610 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/main_content"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:clipToPadding="true"
-    android:fitsSystemWindows="true"
-    android:orientation="vertical">
-    <!--这个linearlayout嵌套先不删除-->
-
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true">
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <RelativeLayout
-                android:id="@+id/lay_fgt_main_mine_head"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/white"
-                android:gravity="center_vertical"
-                android:padding="10dp">
-
-                <ImageView
-                    android:id="@+id/img_fgt_main_mine_head"
-                    android:layout_width="56dp"
-                    android:layout_height="56dp"
-                    android:layout_centerVertical="true"
-                    android:src="@drawable/ic_user_head_default" />
-
-                <RelativeLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_toEndOf="@+id/img_fgt_main_mine_head"
-                    android:layout_toRightOf="@+id/img_fgt_main_mine_head"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/txt_fgt_main_mine_nick"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentTop="true"
-                        android:layout_marginLeft="15dp"
-                        android:layout_marginStart="15dp"
-                        android:text="请登录您的游戏帐号"
-                        android:textColor="@color/black_deep" />
-
-                    <TextView
-                        android:id="@+id/txt_fgt_main_mine_tips"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignLeft="@id/txt_fgt_main_mine_nick"
-                        android:layout_below="@id/txt_fgt_main_mine_nick"
-                        android:layout_marginTop="4dp"
-                        android:maxLines="2"
-                        android:text="点击进入个人中心"
-                        android:textColor="@color/setting_more" />
-
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentRight="true"
-                        android:layout_centerInParent="true"
-                        android:src="@drawable/ic_right_sword_normal" />
-                </RelativeLayout>
-
-
-            </RelativeLayout>
-
-            <LinearLayout
-                android:id="@+id/top_four_view_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/sp_layout_bottom_line"
-                android:minHeight="85dp"
-                android:orientation="horizontal">
-
-                <LinearLayout
-                    android:id="@+id/giftpack_linearlayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:layout_margin="@dimen/about_text_margin_10"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:scaleType="centerInside"
-                        android:src="@drawable/giftpack_top_img" />
-
-                    <TextView
-                        android:id="@+id/giftpack_tv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginTop="@dimen/about_text_margin_10"
-                        android:text="礼包"
-                        android:textColor="@color/gray_3"
-                        android:textSize="@dimen/app_size_tv_small" />
-
-
-                </LinearLayout>
-
-                <View
-                    android:layout_width="1sp"
-                    android:layout_height="28sp"
-                    android:layout_gravity="center_vertical"
-                    android:background="#F2F2F2" />
-
-                <LinearLayout
-                    android:id="@+id/welfare_linearlayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:layout_margin="@dimen/about_text_margin_10"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:orientation="vertical">
-
-
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:scaleType="centerInside"
-                        android:src="@drawable/welfare_rolls_img" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginTop="@dimen/about_text_margin_10"
-                        android:text="福利券"
-                        android:textColor="@color/gray_3"
-                        android:textSize="@dimen/app_size_tv_small" />
-                </LinearLayout>
-
-
-                <View
-                    android:layout_width="1sp"
-                    android:layout_height="28sp"
-                    android:layout_gravity="center_vertical"
-                    android:background="#F2F2F2" />
-
-                <LinearLayout
-                    android:id="@+id/integral_linearlayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:layout_margin="@dimen/about_text_margin_10"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:orientation="vertical">
-
-
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:scaleType="centerInside"
-                        android:src="@drawable/wanbi_top_img" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginTop="@dimen/about_text_margin_10"
-                        android:text="米币"
-                        android:textColor="@color/gray_3"
-                        android:textSize="@dimen/app_size_tv_small" />
-                </LinearLayout>
-
-                <View
-                    android:layout_width="1sp"
-                    android:layout_height="28sp"
-                    android:layout_gravity="center_vertical"
-                    android:background="#F2F2F2" />
-
-                <LinearLayout
-                    android:id="@+id/kims_linearlayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:layout_margin="@dimen/about_text_margin_10"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:orientation="vertical">
-
-
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:scaleType="centerInside"
-                        android:src="@drawable/jifen" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginTop="@dimen/about_text_margin_10"
-                        android:text="积分商城"
-                        android:textColor="@color/gray_3"
-                        android:textSize="@dimen/app_size_tv_small" />
-                </LinearLayout>
-            </LinearLayout>
-
-            <include layout="@layout/interval_gray_padding" />
-
-            <LinearLayout
-                android:id="@+id/lay_fgt_main_mine_bookgame"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:background="@drawable/sp_layout_bottom_line"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-
-                <ImageView
-                    android:layout_width="48dp"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/reservation_icon" />
-
-                <TextView
-                    style="@style/mine_interval"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="预约游戏"
-                    android:textColor="@color/gray_3"
-                    android:textSize="@dimen/app_size_tv_ordinary" />
-
-                <View
-                    android:id="@+id/view_fgt_main_mine_dot"
-                    android:layout_width="6dp"
-                    android:layout_height="6dp"
-                    android:layout_marginRight="14dp"
-                    android:background="@drawable/sp_dot_red"
-                    android:visibility="gone" />
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="10dp"
-                    android:src="@drawable/ic_right_sword_normal" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/lay_fgt_main_mine_gamenum"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:background="@drawable/sp_layout_bottom_line"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-
-                <ImageView
-                    android:layout_width="48dp"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/game_icon" />
-
-                <TextView
-                    android:id="@+id/textView2"
-                    style="@style/mine_interval"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="游戏号"
-                    android:textColor="@color/gray_3"
-                    android:textSize="@dimen/app_size_tv_ordinary" />
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="10dp"
-                    android:src="@drawable/ic_right_sword_normal" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/lay_fgt_main_mine_wallet"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:background="@drawable/sp_layout_bottom_line"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-
-                <ImageView
-                    android:layout_width="48dp"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/wallet_icon" />
-
-                <TextView
-                    style="@style/mine_interval"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="我的钱包"
-                    android:textColor="@color/gray_3"
-                    android:textSize="@dimen/app_size_tv_ordinary" />
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="10dp"
-                    android:src="@drawable/ic_right_sword_normal" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/lay_fgt_main_mine_coin"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:background="@drawable/sp_layout_bottom_line"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-
-                <ImageView
-                    android:layout_width="48dp"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/paycoins_icon" />
-
-                <TextView
-                    style="@style/mine_interval"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="我的米币"
-                    android:textColor="@color/gray_3"
-                    android:textSize="@dimen/app_size_tv_ordinary" />
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="10dp"
-                    android:src="@drawable/ic_right_sword_normal" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/lay_fgt_main_mine_myorder"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:background="@drawable/sp_layout_bottom_line"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-
-                <ImageView
-                    android:layout_width="48dp"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/order_icon" />
-
-                <TextView
-                    style="@style/mine_interval"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="我的订单"
-                    android:textColor="@color/gray_3"
-                    android:textSize="@dimen/app_size_tv_ordinary" />
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="10dp"
-                    android:src="@drawable/ic_right_sword_normal" />
-            </LinearLayout>
-
-
-            <LinearLayout
-                android:id="@+id/lay_fgt_main_mine_seller"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:background="@drawable/sp_layout_bottom_line"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-
-                <ImageView
-                    android:layout_width="48dp"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/sellercenter_icon" />
-
-                <TextView
-                    style="@style/mine_interval"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="卖家中心"
-                    android:textColor="@color/gray_3"
-                    android:textSize="@dimen/app_size_tv_ordinary" />
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="10dp"
-                    android:src="@drawable/ic_right_sword_normal" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/lay_fgt_main_mine_sellaccount"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:background="@drawable/sp_layout_bottom_line"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:visibility="gone">
-
-
-                <ImageView
-                    android:layout_width="48dp"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/sell_icon" />
-
-                <TextView
-                    style="@style/mine_interval"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="出售游戏号"
-                    android:textColor="@color/gray_3"
-                    android:textSize="@dimen/app_size_tv_ordinary" />
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="10dp"
-                    android:src="@drawable/ic_right_sword_normal" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/lay_fgt_main_mine_mygift"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:background="@drawable/sp_layout_bottom_line"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:visibility="gone">
-
-
-                <ImageView
-                    android:layout_width="48dp"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/reward_icon" />
-
-                <TextView
-                    style="@style/mine_interval"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="我的奖励"
-                    android:textColor="@color/gray_3"
-                    android:textSize="@dimen/app_size_tv_ordinary" />
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="10dp"
-                    android:src="@drawable/ic_right_sword_normal" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/lay_fgt_taozhewan_mine_about"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:background="@drawable/sp_layout_bottom_line"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:visibility="gone">
-
-
-                <ImageView
-                    android:layout_width="48dp"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/mine_taozhewan_icon" />
-
-                <TextView
-                    style="@style/mine_interval"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/tab_viewpager_taozhewan"
-                    android:textColor="@color/gray_3"
-                    android:textSize="@dimen/app_size_tv_ordinary" />
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="10dp"
-                    android:src="@drawable/ic_right_sword_normal" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/lay_fgt_hoggerel_mine_about"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:background="@drawable/sp_layout_bottom_line"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:visibility="gone">
-
-
-                <ImageView
-                    android:layout_width="48dp"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/mine_taozhewan_icon" />
-
-                <TextView
-                    style="@style/mine_interval"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/mine_hoggerel"
-                    android:textColor="@color/gray_3"
-                    android:textSize="@dimen/app_size_tv_ordinary" />
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="10dp"
-                    android:src="@drawable/ic_right_sword_normal" />
-            </LinearLayout>
-
-            <include
-                android:id="@+id/interval_gray_view"
-                layout="@layout/interval_gray_padding" />
-
-            <LinearLayout
-                android:id="@+id/lay_fgt_main_mine_about"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:background="@drawable/sp_layout_bottom_line"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-
-                <ImageView
-                    android:layout_width="48dp"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/about_icon" />
-
-                <TextView
-                    style="@style/mine_interval"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/title_activity_setting"
-                    android:textColor="@color/gray_3"
-                    android:textSize="@dimen/app_size_tv_ordinary" />
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="10dp"
-                    android:src="@drawable/ic_right_sword_normal" />
-            </LinearLayout>
-
-
-            <LinearLayout
-                android:id="@+id/lay_fgt_main_mine_advice"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-
-                <ImageView
-                    android:layout_width="48dp"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/feedback_icon" />
-
-                <TextView
-                    style="@style/mine_interval"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="意见反馈"
-                    android:textColor="@color/gray_3"
-                    android:textSize="@dimen/app_size_tv_ordinary" />
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="10dp"
-                    android:src="@drawable/ic_right_sword_normal" />
-            </LinearLayout>
-        </LinearLayout>
-    </ScrollView>
-</LinearLayout>

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

@@ -6,7 +6,6 @@
     android:layout_height="match_parent"
     android:background="?attr/main_color"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="com.kfzs.duanduan.ActUser"
     tools:showIn="@layout/activity_user">
 
     <com.kfzs.android.view.widget.CircleImageView