fuck conflict

app/build.gradle

@@ -415,7 +415,6 @@ dependencies {
     implementation 'com.danikula:videocache:2.7.1'
 
     //视频图片选择
-<<<<<<< HEAD
 //    implementation ('cn.finalteam.rxgalleryfinal:library:1.1.3') {
 //        exclude group: 'com.android.support', module: 'appcompat-v7'
 //        exclude group: 'io.reactivex.rxjava2', module: 'rxandroid'
@@ -427,26 +426,6 @@ dependencies {
 //    implementation project(':RxGalleryFinal')
     implementation "com.android.support:exifinterface:$supportLibVersion"
     implementation ('com.qiniu:qiniu-android-sdk:7.3.13') {
-=======
-
-    //    implementation ('cn.finalteam.rxgalleryfinal:library:1.1.3') {
-
-    //        exclude group: 'com.android.support', module: 'appcompat-v7'
-
-    //        exclude group: 'io.reactivex.rxjava2', module: 'rxandroid'
-
-    //        exclude group: 'io.reactivex.rxjava2', module: 'rxjava'
-
-    //        exclude group: 'com.yalantis', module: 'ucrop'
-
-    //        exclude group: 'com.android.support', module: 'recyclerview-v7'
-
-    //    }
-
-    //    implementation "com.android.support:exifinterface:$supportLibVersion"
-    implementation project(':RxGalleryFinal')
-    implementation('com.qiniu:qiniu-android-sdk:7.3.13') {
->>>>>>> hj
         exclude group: 'com.squareup.okhttp3', module: 'okhttp'
     }
 }

app/src/main/AndroidManifest.xml

@@ -630,7 +630,6 @@
         <meta-data
             android:name="com.baidu.lbsapi.API_KEY"
             android:value="gXD6RhE7ncVIcl1crk5SeUoVm7ceNtkL" />
-        </meta-data>
         <service android:name="com.baidu.location.f" android:enabled="true" android:process=":remote"> </service>
         <!--  百度定位 sdk end -->
 
@@ -650,11 +649,6 @@
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ActSheepPngList"
             android:screenOrientation="portrait"/>
-        <activity android:name="com.sheep.gamegroup.view.activity.ActFindGame"
-            android:screenOrientation="portrait"/>
-        <activity android:name="com.sheep.gamegroup.view.activity.ActFindInformation"
-            android:screenOrientation="portrait"
-            android:configChanges="orientation|screenSize|keyboardHidden"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ActReservation"
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ActGameAgencyRecharge"
@@ -665,11 +659,6 @@
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ActSetting"
             android:screenOrientation="portrait"/>
-        <activity android:name="com.sheep.gamegroup.view.activity.ActivityMessages"
-            android:screenOrientation="portrait"/>
-        <activity
-            android:name="com.sheep.gamegroup.view.activity.ActMainGame"
-            android:screenOrientation="portrait" />
         <activity android:name="com.sheep.gamegroup.view.activity.ActGameCenter"
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ActDownloadWelfareList"
@@ -678,8 +667,6 @@
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ActMyWelfare"
             android:screenOrientation="portrait"/>
-        <activity android:name="com.sheep.gamegroup.view.activity.MessageReplyDetailActivity"
-            android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.MessageInteractionDetailActivity"
             android:exported="true"/>
 
@@ -694,30 +681,7 @@
             android:process=":remote" />
         <!-- 百度定位 sdk end -->
 
-        <activity
-            android:name="com.sheep.gamegroup.view.activity.ActNotice"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name="com.sheep.gamegroup.view.activity.ActGuide"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name="com.sheep.gamegroup.view.activity.ActLoadH5"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name="com.sheep.gamegroup.view.activity.ActUserLabelList"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name="com.sheep.gamegroup.view.activity.ActNewAboutUs"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name="com.sheep.gamegroup.view.activity.ActInstallApkList"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name="com.sheep.gamegroup.view.activity.ActSheepApkList"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name="com.sheep.gamegroup.view.activity.ActSheepPngList"
-            android:screenOrientation="portrait" />
+
         <!-- <activity -->
         <!-- android:name="com.sheep.gamegroup.view.activity.ActFindGame" -->
         <!-- android:screenOrientation="portrait" /> -->
@@ -731,48 +695,18 @@
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
         <activity
-            android:name="com.sheep.gamegroup.view.activity.ActReservation"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name="com.sheep.gamegroup.view.activity.ActGameAgencyRecharge"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name="com.sheep.gamegroup.view.activity.ActGameAccount"
-            android:screenOrientation="portrait" />
-        <activity
             android:name="com.sheep.gamegroup.view.activity.ActSearchAppOrTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.sheep.gamegroup.view.activity.ActSearchGame"
-            android:screenOrientation="portrait" />
-        <activity
             android:name="com.sheep.gamegroup.view.activity.ActSearchApp"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.sheep.gamegroup.view.activity.ActSetting"
-            android:screenOrientation="portrait" />
-        <activity
             android:name="com.sheep.gamegroup.view.activity.ActMsg"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.sheep.gamegroup.view.activity.ActGameCenter"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name="com.sheep.gamegroup.view.activity.ActDownloadWelfareList"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name="com.sheep.gamegroup.view.activity.ActGiftCenter"
-            android:screenOrientation="portrait" />
-        <activity
             android:name="com.sheep.gamegroup.view.activity.ActGiftDetail"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.sheep.gamegroup.view.activity.ActMyWelfare"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name="com.sheep.gamegroup.view.activity.MessageInteractionDetailActivity"
-            android:screenOrientation="portrait" />
-        <activity
             android:name="com.sheep.gamegroup.view.activity.ActModifyThird"
             android:screenOrientation="portrait" />
         <activity
@@ -808,10 +742,6 @@
 
         <!-- start幂动科技 -->
 
-        <activity
-            android:name="com.sheep.gamegroup.view.activity.ActMiDong"
-            android:screenOrientation="portrait" />
-
         <service
             android:name="com.mdad.sdk.mdsdk.monitor.MonitorService"
             android:enabled="true"
@@ -898,7 +828,7 @@
             android:name="com.sheep.gamegroup.find.activity.ActMediaChoose"
             android:screenOrientation="portrait" />
         <activity android:name="com.sheep.gamegroup.module.login.LoginAct" />
-        <activity android:name="com.sheep.gamegroup.module.ChangePasswordAct"></activity>
+        <activity android:name="com.sheep.gamegroup.module.login.ChangePasswordAct"></activity>
     </application>
 
 </manifest>

app/src/main/java/com/sheep/gamegroup/module/ChangePasswordAct.java

@@ -1,4 +1,4 @@
-package com.sheep.gamegroup.module;
+package com.sheep.gamegroup.module.login;
 
 import android.app.Activity;
 import android.os.Bundle;

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

@@ -45,7 +45,7 @@ import com.sheep.gamegroup.model.entity.Video;
 import com.sheep.gamegroup.model.entity.WebviewEntity;
 import com.sheep.gamegroup.model.entity.XianWanEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.module.ChangePasswordAct;
+import com.sheep.gamegroup.module.login.ChangePasswordAct;
 import com.sheep.gamegroup.util.share.ShareLinkConfig;
 import com.sheep.gamegroup.view.activity.ActApprenticeRedPacket;
 import com.sheep.gamegroup.view.activity.ActArticleComment;
@@ -1106,7 +1106,7 @@ public class Jump2View {
      * @param context
      */
     public void goMainGame(Context context) {
-        Intent intent = new Intent(context, ActMainGame.class);
+        Intent intent = new Intent(context, ActGameCenter.class);
         context.startActivity(intent);
     }
 

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

@@ -23,7 +23,6 @@ import android.support.annotation.StringRes;
 import android.support.v4.app.FragmentActivity;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.Html;
 import android.text.TextUtils;
@@ -107,7 +106,6 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -1944,79 +1942,6 @@ public class ViewUtil {
 
 
     /**
-     * 初始化画廊
-     *
-     * @param mRecyclerView ,recycleView
-     * @param mBlurView     显示的ImageView
-     * @param mList         图片文件地址集合，
-     * @param context       。。。
-     */
-    private static void init(SpeedRecyclerView mRecyclerView, ImageView mBlurView, List<Integer> mList, Context context) {
-        if (mList == null) {
-            mList = new ArrayList<>();
-        }
-        for (int i = 0; i < 10; i++) {
-            mList.add(R.drawable.kaipin);
-            mList.add(R.drawable.kaipin);
-            mList.add(R.drawable.kaipin);
-        }
-
-        final LinearLayoutManager linearLayoutManager = new LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false);
-        mRecyclerView.setLayoutManager(linearLayoutManager);
-        mRecyclerView.setAdapter(new CardAdapter(mList));
-        // mRecyclerView绑定scale效果
-        mCardScaleHelper.setCurrentItemPos(2);
-        mCardScaleHelper.attachToRecyclerView(mRecyclerView);
-
-        initBlurBackground(mBlurView, mRecyclerView, mList, context);
-    }
-
-    /**
-     * 给画廊设置背景
-     *
-     * @param mBlurView
-     * @param mRecyclerView
-     * @param mList
-     * @param context
-     */
-    private static void initBlurBackground(ImageView mBlurView, RecyclerView mRecyclerView, final List<Integer> mList, final Context context) {
-        final ImageView finalMBlurView = mBlurView;
-        mRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
-            @Override
-            public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
-                super.onScrollStateChanged(recyclerView, newState);
-                if (newState == RecyclerView.SCROLL_STATE_IDLE) {
-                    notifyBackgroundChange(finalMBlurView, mList, context);
-                }
-            }
-        });
-
-        notifyBackgroundChange(mBlurView, mList, context);
-    }
-
-    /**
-     * 检测画廊图片变化
-     *
-     * @param mBlurView
-     * @param mList
-     * @param context
-     */
-    private static void notifyBackgroundChange(final ImageView mBlurView, List<Integer> mList, final Context context) {
-        if (mLastPos == mCardScaleHelper.getCurrentItemPos()) return;
-        mLastPos = mCardScaleHelper.getCurrentItemPos();
-        final int resId = mList.get(mCardScaleHelper.getCurrentItemPos());
-        mBlurView.removeCallbacks(mBlurRunnable);
-        mBlurRunnable = new Runnable() {
-            @Override
-            public void run() {
-                Bitmap bitmap = BitmapFactory.decodeResource(context.getResources(), resId);
-                ViewSwitchUtils.startSwitchBackgroundAnim(mBlurView, BlurBitmapUtils.getBlurBitmap(mBlurView.getContext(), bitmap, 15));
-            }
-        };
-        mBlurView.postDelayed(mBlurRunnable, 500);
-    }
-
-    /**
      * 添加游戏账户
      */
     public void showAddAccount(Activity activity, Action1<Integer> action1) {
@@ -2235,4 +2160,4 @@ public class ViewUtil {
 
         return view;
     }
-}
+}

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

@@ -1,51 +0,0 @@
-package com.sheep.gamegroup.view.activity;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.view.View;
-import android.widget.TextView;
-
-import com.sheep.jiuyan.samllsheep.R;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-
-/**
- * created on：2018/8/28 on 17:55
- * created by: YSL
- * 描述:消息回复详情Activity
- */
-public class MessageReplyDetailActivity extends AppCompatActivity {
-    @BindView(R.id.tv_content)
-    TextView tvContent;
-    @BindView(R.id.tv_title)
-    TextView tvTitle;
-    @BindView(R.id.txt_baseactivity_title)
-    TextView tvBaseTitle;
-
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_messagesystem);
-        ButterKnife.bind(this);
-    }
-
-    @OnClick({R.id.img_baseactivity_title})
-    public void initClick(View view) {
-        switch (view.getId()) {
-            case R.id.img_baseactivity_title:
-                MessageReplyDetailActivity.this.finish();
-                break;
-        }
-
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-
-    }
-}

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

@@ -1657,7 +1657,6 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         super.onDestroy();
         EventBus.getDefault().unregister(this);
         CommonUtil.getInstance().cancelAllTimers(CommonUtil.getInstance().timerHashMap);
-        Aria.download(this).unRegister();
     }
 
 

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

@@ -1,37 +0,0 @@
-package com.sheep.gamegroup.view.adapter;
-
-import android.content.Context;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-
-import com.sheep.gamegroup.view.fragment.MessageCenterFragment;
-import com.sheep.gamegroup.view.fragment.MessageReplyFragment;
-
-/**
- * created on：2018/8/29 on 9:47
- * created by: YSL
- * 描述: 消息模块的FragmentAdapter，
- */
-public class MessageAdapter extends FragmentPagerAdapter {
-    private Context context;
-
-    public MessageAdapter(FragmentManager fm, Context context) {
-        super(fm);
-        this.context = context;
-    }
-
-    @Override
-    public Fragment getItem(int position) {
-        if (position == 0) {
-            return new MessageCenterFragment(context);
-        } else {
-            return new MessageReplyFragment(context);
-        }
-    }
-
-    @Override
-    public int getCount() {
-        return 2;
-    }
-}

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

@@ -470,191 +470,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 
 
     /**
-     * @return 是否显示兑换邀请码红包
-     */
-    private void isShowRedPackageWithCode() {
-        //  DataUtil.getInstance().是官方包吗();
-        if (userEntity == null) {
-            userEntity = DataUtil.getInstance().getUserEntity();
-        }
-//userEntity.getParent_code()获取到的不会存在null，没有时，时"",所以不用判断为null的情况
-        if (!userEntity.getParent_code().equals("") || (userEntity.getCreate_time_line() < 2) || (userEntity.getPackage_cate() == 1)) {
-
-        } else {
-            changeRedPackage(getActivity(), LayoutInflater.from(getContext()).inflate(R.layout.activity_main, null), this);
-        }
-
-    }
-
-    /**
-     * 兑换红包弹窗
-     *
-     * @param mActivity 当前Activity的，
-     */
-    public static void changeRedPackage(final Activity mActivity, View viewAnchor, final FgtSmallSheep fgtSmallSheep) {
-        View view = LayoutInflater.from(mActivity).inflate(R.layout.pop_get_redpackage, null);
-        final EditText edInvitationCode = view.findViewById(R.id.ed_invitation_code);
-        TextView tvTitle = view.findViewById(R.id.tv_title);
-        final TextView tvGetRedPackage = view.findViewById(R.id.tv_get_redpackage);
-        ImageView ivClose = view.findViewById(R.id.iv_close);
-        final PopupWindow popupWindow = new PopupWindow(mActivity);
-        popupWindow.setContentView(view);
-        popupWindow.setWidth(ActionBar.LayoutParams.MATCH_PARENT);
-        popupWindow.setHeight(ActionBar.LayoutParams.MATCH_PARENT);
-        popupWindow.setTouchable(true);
-        popupWindow.setFocusable(true);
-        popupWindow.setOutsideTouchable(false);
-        popupWindow.setBackgroundDrawable(new BitmapDrawable());
-        backgroundAlpha(0.7f, mActivity);
-        try {
-            popupWindow.showAtLocation(viewAnchor, Gravity.CENTER, 0, 0);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        popupWindow.setOnDismissListener(new ViewUtil.PopDismissListener(mActivity));
-        tvTitle.setText("邀请码领取，金额更大");
-        tvGetRedPackage.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (TextUtils.isEmpty(edInvitationCode.getText())) {
-                    G.showToast("邀请码不能为空！");
-                } else {
-                    fgtSmallSheep.getRedPackage(edInvitationCode.getText().toString(), popupWindow);
-                    popupWindow.dismiss();
-                }
-            }
-        });
-        edInvitationCode.setOnLongClickListener(new View.OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View view) {
-                // 获取系统剪贴板
-                ClipboardManager clipboard = (ClipboardManager) mActivity.getSystemService(Context.CLIPBOARD_SERVICE);
-                // 获取剪贴板的剪贴数据集
-                ClipData clipData = clipboard.getPrimaryClip();
-
-                if (clipData != null && clipData.getItemCount() > 0) {
-                    // 从数据集中获取（粘贴）第一条文本数据
-                    CharSequence codetext = clipData.getItemAt(0).getText();
-                    if (!TextUtils.isEmpty(codetext)){
-                        edInvitationCode.setText(codetext);
-                    }
-                }
-                return false;
-            }
-        });
-        ivClose.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                popupWindow.dismiss();
-            }
-        });
-
-    }
-
-    /**
-     * 兑换红包
-     *
-     * @param code ,邀请码
-     */
-    public void getRedPackage(String code, final PopupWindow popupWindow) {
-        SheepApp.getInstance().getNetComponent().getApiService().exchangeRedPackage(code)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        LogUtil.logI("0------" + new Gson().toJson(baseMessage));
-                        G.showToast(baseMessage.getMsg());
-                    }
-
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        showRedPackageAfterInvitation(activity, LayoutInflater.from(getContext()).inflate(R.layout.activity_main, null), baseMessage);
-                        if (popupWindow.isShowing()) {
-                            popupWindow.dismiss();
-                        }
-
-                    }
-                });
-    }
-
-    /**
-     * 邀请成功后在个人资料显示领红包弹窗
-     *
-     * @param mActivity 当前Activity
-     */
-    public void showRedPackageAfterInvitation(final Activity mActivity, View viewAnchor, BaseMessage baseMessage) {
-        if (viewAnchor == null) {
-            return;
-        }
-        View view = LayoutInflater.from(mActivity).inflate(R.layout.dialog_redpackage_after_invitation, null, false);
-        TextView tvGetRedPackage = view.findViewById(R.id.tv_get_redpackage);
-        TextView tvMoney = view.findViewById(R.id.tv_money);
-        ImageView ivClose = view.findViewById(R.id.iv_close);
-        final PopupWindow popupWindow = new PopupWindow(mActivity);
-        popupWindow.setContentView(view);
-        popupWindow.setAnimationStyle(R.style.Rising);
-        popupWindow.setWidth(ActionBar.LayoutParams.MATCH_PARENT);
-        popupWindow.setHeight(ActionBar.LayoutParams.MATCH_PARENT);
-        popupWindow.setTouchable(true);
-        popupWindow.setFocusable(true);
-        popupWindow.setOutsideTouchable(false);
-        popupWindow.setBackgroundDrawable(new BitmapDrawable());
-        backgroundAlpha(0.7f, mActivity);
-        try {
-            popupWindow.showAtLocation(viewAnchor, Gravity.CENTER, 0, 0);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        popupWindow.setOnDismissListener(new ViewUtil.PopDismissListener(mActivity));
-        tvMoney.setText("1");
-        tvGetRedPackage.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                //   CommonUtil.getInstance().updateUserInfo(null);
-                updateUserInfo(null);
-                popupWindow.dismiss();
-            }
-        });
-        ivClose.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                popupWindow.dismiss();
-
-            }
-        });
-
-    }
-
-    public void updateUserInfo(final Action1<UserEntity> action1) {
-        SheepApp.get(SheepApp.getInstance())
-                .getNetComponent()
-                .getApiService()
-                .getInfo()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        if (action1 != null)
-                            action1.call(null);
-
-                    }
-
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        UserEntity userEntity = baseMessage.getData(UserEntity.class);
-                        if (userEntity != null) {
-                            DataUtil.getInstance().setUserEntity(userEntity);
-                        }
-                        if (action1 != null)
-                            action1.call(userEntity);
-                    }
-                });
-    }
-
-
-    /**
      * 新手任务对话框中，注册账号并登录得红包，这里判断是否已经领取过了，如果领取过了就不显示，不然就显示
      *
      * @param obj ,Context对象

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

@@ -1,78 +0,0 @@
-package com.sheep.gamegroup.view.fragment;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.OrientationHelper;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.sheep.gamegroup.view.activity.MessageReplyDetailActivity;
-import com.sheep.gamegroup.view.adapter.MessageLeftAdapter;
-import com.sheep.jiuyan.samllsheep.R;
-
-import java.util.List;
-
-/**
- * created on：2018/8/28 on 12:32
- * created by: YSL
- * 描述:
- */
-
-@SuppressLint("ValidFragment")
-public class MessageCenterFragment extends Fragment implements MessageLeftAdapter.ItemOnClickListener {
-    private Context mContext;
-    private RecyclerView recyclerView;
-    private MessageLeftAdapter adapter;
-    private List<?> mList;
-
-
-    public MessageCenterFragment() {
-    }
-
-    public MessageCenterFragment(Context mContext) {
-        this.mContext = mContext;
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = null;
-        if (mList == null || mList.isEmpty()) {
-            view=inflater.inflate(R.layout.layout_empty_no_data,null);
-        } else {
-            view = inflater.inflate(R.layout.fragment_messagecenter, null);
-            recyclerView = view.findViewById(R.id.recycle_fragment_message_center);
-        }
-        return view;
-    }
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        if (mList==null||mList.isEmpty()){
-            return;
-        }
-        adapter = new MessageLeftAdapter(mContext, mList, this);
-        LinearLayoutManager manager = new LinearLayoutManager(mContext);
-        manager.setOrientation(OrientationHelper.VERTICAL);
-        recyclerView.setLayoutManager(manager);
-        recyclerView.setAdapter(adapter);
-    }
-
-    @Override
-    public void itemClick(int position) {
-        if (getActivity() != null) {
-            startActivity(new Intent(getActivity(), MessageReplyDetailActivity.class));
-        }
-    }
-}

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

@@ -1,67 +0,0 @@
-package com.sheep.gamegroup.view.fragment;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.OrientationHelper;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.sheep.gamegroup.view.activity.MessageInteractionDetailActivity;
-import com.sheep.gamegroup.view.adapter.MessageLeftAdapter;
-import com.sheep.jiuyan.samllsheep.R;
-
-import java.util.List;
-
-/**
- * created on：2018/8/29 on 9:58
- * created by: YSL
- * 描述:
- */
-
-@SuppressLint("ValidFragment")
-public class MessageReplyFragment extends Fragment implements MessageLeftAdapter.ItemOnClickListener {
-    private Context mContext;
-    private RecyclerView recyclerView;
-    private MessageLeftAdapter adapter;
-    private List<?> mList;
-
-    public MessageReplyFragment() {
-    }
-
-    public MessageReplyFragment(Context mContext) {
-        this.mContext = mContext;
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_messagecenter, null);
-        recyclerView = view.findViewById(R.id.recycle_fragment_message_center);
-        return view;
-    }
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        adapter = new MessageLeftAdapter(mContext, mList, this);
-        LinearLayoutManager manager = new LinearLayoutManager(mContext);
-        manager.setOrientation(OrientationHelper.VERTICAL);
-        recyclerView.setLayoutManager(manager);
-        recyclerView.setAdapter(adapter);
-    }
-
-    @Override
-    public void itemClick(int position) {
-        if (getActivity()!=null){
-            startActivity(new Intent(getActivity(), MessageInteractionDetailActivity.class));
-        }
-    }
-}

app/src/main/res/drawable/shape_blue_stroke_withe_radius_5.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 <corners android:radius="5dp"/>
-    <solid android:color="@color/blue_2EC2F7"/>
+    <solid android:color="@color/blue_34a6e7"/>
 </shape>