merge conflict

app/src/main/AndroidManifest.xml

@@ -619,6 +619,63 @@
         <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 -->
+
+        <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"/>
+        <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"
+            android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.ActGameAccount"
+            android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.ActSearchGame"
+            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"
+            android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.ActGiftCenter"
+            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"/>
+
+        <!--start幂动科技-->
+
+        <activity android:name="com.sheep.gamegroup.view.activity.ActMiDong"
+            android:screenOrientation="portrait"/>
 
         <service
             android:name="com.baidu.location.f"
@@ -829,4 +886,4 @@
             android:exported="true" />
     </application>
 
-</manifest>
+</manifest>

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

@@ -0,0 +1,20 @@
+package com.kfzs.duanduan.fragment;
+
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.base.BaseFragment;
+
+/**
+ * Created by realicing on 2018/8/30.
+ * realicing@sina.com
+ */
+public class FgtNull extends BaseFragment {
+    @Override
+    public int getLayoutId() {
+        return R.layout.empty;
+    }
+
+    @Override
+    public void onViewCreated() {
+
+    }
+}

app/src/main/java/com/kfzs/duanduan/utils/StatusBarUtils.java

@@ -4,11 +4,13 @@ package com.kfzs.duanduan.utils;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Context;
+import android.content.res.Resources;
 import android.graphics.Color;
 import android.os.Build;
 import android.support.annotation.ColorInt;
 import android.support.design.widget.CoordinatorLayout;
 import android.support.v4.widget.DrawerLayout;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
@@ -16,6 +18,8 @@ import android.widget.LinearLayout;
 
 import com.sheep.jiuyan.samllsheep.R;
 
+import java.lang.reflect.Method;
+
 public class StatusBarUtils {
 
     public static final int DEFAULT_STATUS_BAR_ALPHA = 112;
@@ -601,7 +605,8 @@ public class StatusBarUtils {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
             activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-            activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+            if (!isHaveNavigationBar(activity))
+                activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
             activity.getWindow().setStatusBarColor(Color.TRANSPARENT);
         } else {
             activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
@@ -657,4 +662,27 @@ public class StatusBarUtils {
         blue = (int) (blue * a + 0.5);
         return 0xff << 24 | red << 16 | green << 8 | blue;
     }
+
+    public static boolean isHaveNavigationBar(Activity context) {
+
+        boolean isHave = false;
+        Resources rs = context.getResources();
+        int id = rs.getIdentifier("config_showNavigationBar", "bool", "android");
+        if (id > 0) {
+            isHave = rs.getBoolean(id);
+        }
+        try {
+            Class systemPropertiesClass = Class.forName("android.os.SystemProperties");
+            Method m = systemPropertiesClass.getMethod("get", String.class);
+            String navBarOverride = (String) m.invoke(systemPropertiesClass, "qemu.hw.mainkeys");
+            if ("1".equals(navBarOverride)) {
+                isHave = false;
+            } else if ("0".equals(navBarOverride)) {
+                isHave = true;
+            }
+        } catch (Exception e) {
+            Log.w("TAG", e);
+        }
+        return isHave;
+    }
 }

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

@@ -1101,7 +1101,7 @@ public class Jump2View {
      * @param context
      */
     public void goMainGame(Context context) {
-        Intent intent = new Intent(context, ActGameCenter.class);
+        Intent intent = new Intent(context, ActMainGame.class);
         context.startActivity(intent);
     }
 
@@ -1797,7 +1797,6 @@ public class Jump2View {
 
             }
         }, l);
-
     }
 
     /**

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

@@ -25,6 +25,7 @@ import android.support.v4.app.FragmentActivity;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.AppCompatCheckedTextView;
 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;
@@ -106,6 +107,7 @@ 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;
@@ -1894,6 +1896,79 @@ 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) {
@@ -2112,4 +2187,4 @@ public class ViewUtil {
 
         return view;
     }
-}
+}

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

@@ -0,0 +1,51 @@
+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,6 +1657,7 @@ 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

@@ -0,0 +1,37 @@
+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/FgtMainAudit.java

@@ -8,6 +8,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.sheep.gamegroup.event.BigEvent;

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

@@ -158,6 +158,7 @@ public class FgtRouser extends BaseFragment {
                                 images1[i] = images[i];
                             }
                         }
+
                         one_img_iv.setVisibility(View.GONE);
                         home_list_gridview_gv.setVisibility(View.VISIBLE);
                         home_list_gridview_gv.setAdapter(new ArrayAdapter<String>(activity, R.layout.rouser_image_adp ,images1){

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

@@ -470,6 +470,191 @@ 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

@@ -0,0 +1,78 @@
+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

@@ -0,0 +1,67 @@
+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_rectangle_no_lb.xml

@@ -8,4 +8,4 @@ android:shape="rectangle">
 <stroke
     android:width="1px"
     android:color="#4889FF" />
-</shape>
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+<corners android:radius="5dp"/>
+    <solid android:color="@color/blue_2EC2F7"/>
+</shape>

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

@@ -6,4 +6,4 @@
     <gradient
         android:endColor="#1376E2"
         android:startColor="#1376E2" />
-</shape>
+</shape>

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

@@ -5,7 +5,13 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginTop="24dp" />
+
     <android.support.constraint.ConstraintLayout
+        android:id="@+id/root_1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@mipmap/audit_top_bg"

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/frame_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginBottom="@dimen/bottom_height" />

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

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content">
 
     <RelativeLayout
+        android:id="@+id/layout_f"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
+        android:layout_alignParentBottom="true"
         android:background="#ffffffff">
 
         <TextView
@@ -28,4 +29,32 @@
             android:layout_marginTop="20dp" />
     </RelativeLayout>
 
-</FrameLayout>
+   <RelativeLayout
+       android:layout_width="match_parent"
+       android:layout_height="450dp"
+       android:id="@+id/layout_f1"
+       android:layout_above="@id/layout_f"
+       android:visibility="gone">
+       <ImageView
+           android:id="@+id/blurView"
+           android:layout_width="match_parent"
+           android:layout_height="match_parent"
+           android:background="#3f000000"
+           android:scaleType="centerCrop"/>
+
+       <com.kfzs.duanduan.cardview.SpeedRecyclerView
+           android:id="@+id/recyclerView"
+           android:layout_width="match_parent"
+           android:layout_height="match_parent"
+           android:layout_marginBottom="30dp"
+           android:layout_marginTop="30dp"/>
+   </RelativeLayout>
+
+    <View
+        android:id="@+id/empty_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/layout_f1"
+        android:visibility="gone"/>
+
+</RelativeLayout>

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

@@ -19,4 +19,4 @@
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1" />
-</LinearLayout>
+</LinearLayout>

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

@@ -59,7 +59,6 @@
                 android:layout_alignParentBottom="true"
                 android:layout_alignParentEnd="true"
                 android:background="@color/translate"
-                android:gravity="center"
                 android:src="@mipmap/setting" />
 
 

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

@@ -7,6 +7,7 @@
     android:scrollbars="none">
 
     <LinearLayout
+        android:id="@+id/root_4"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">

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

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RelativeLayout
+        android:id="@+id/view_empty"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:id="@+id/iv_empty"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:src="@mipmap/wushuju" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/iv_empty"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="10dp"
+            android:text="@string/wushuju" />
+    </RelativeLayout>
+</android.support.constraint.ConstraintLayout>

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

@@ -34,6 +34,7 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
+                android:layout_marginBottom="@dimen/content_padding"
                 android:background="@color/white" />
 
             <LinearLayout
@@ -59,6 +60,7 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
+                android:layout_marginBottom="@dimen/content_padding"
                 android:background="@color/white" />
             <android.support.v7.widget.AppCompatEditText
                 style="@style/style_login_et"

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

@@ -28,4 +28,4 @@
         android:layout_height="match_parent"
         android:layout_below="@+id/check_net_ll"
         android:descendantFocusability="blocksDescendants"/>
-</RelativeLayout>
+</RelativeLayout>

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

@@ -115,4 +115,4 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true" />
-</RelativeLayout>
+</RelativeLayout>

app/src/main/res/values/dd_styles.xml

@@ -393,7 +393,6 @@
     <style name="style_login_et">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">@dimen/edt_heigh_default</item>
-        <item name="android:layout_margin">@dimen/content_padding_small</item>
         <item name="android:background">@color/transparent</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:textColorHint">#A0D3F6</item>