红包动画；

沉浸式状态栏；
优化

(cherry picked from commit f1d70f3)

app/src/main/AndroidManifest.xml

@@ -589,6 +589,10 @@
             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幂动科技-->
 

app/src/main/java/com/kfzs/duanduan/ActMain.java

@@ -1,13 +1,21 @@
 package com.kfzs.duanduan;
 
+import android.annotation.SuppressLint;
 import android.content.Intent;
+import android.graphics.Color;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
 import com.kfzs.appstore.utils.restful.KFZSNetwork;
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.react.TabsHelper;
+import com.kfzs.duanduan.utils.StatusBarUtils;
 import com.kfzs.duanduan.utils.dlg.HelperUtils;
 import com.kfzs.duanduan.view.DialogStorageLow;
 import com.sheep.gamegroup.absBase.BaseActivity;
@@ -19,12 +27,17 @@ import com.umeng.socialize.UMShareAPI;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
+import java.lang.reflect.Field;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import rx.functions.Action1;
 
 
-public class ActMain extends BaseActivity {
+/**
+ *
+ */
+public class ActMain extends BaseActivity implements TabsHelper.ItemPosition {
     private static final String TAG = "ActMain";
 
     @BindView(R.id.other_container)
@@ -36,9 +49,10 @@ public class ActMain extends BaseActivity {
     private ImageView mImgDot;//下载按钮的小红点
 
 
-
     public TabsHelper tabsHelper;
 
+    private TabsHelper.ItemPosition itemPosition;
+
     @Override
     protected int getLayoutId() {
         return R.layout.activity_main;
@@ -47,7 +61,7 @@ public class ActMain extends BaseActivity {
     @Override
     public void initView() {
         KFZSApp.actMain = this;
-        tabsHelper = new TabsHelper();
+        tabsHelper = new TabsHelper(this);
         HelperUtils.init();//初始化屏幕的高，density等
         ButterKnife.bind(this);
         EventBus.getDefault().register(this);
@@ -80,6 +94,33 @@ public class ActMain extends BaseActivity {
 
     }
 
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setStatusSC();
+    }
+
+    /**
+     * 设置状态栏沉浸式
+     */
+    private void setStatusSC() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            getWindow().setStatusBarColor(Color.TRANSPARENT);
+            getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION	 | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+        }
+    }
+
+    /**
+     * 设置状态栏正常
+     */
+    private void setStatusVI() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            getWindow().setStatusBarColor(Color.parseColor("#29d6fd"));
+           //getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+        }
+    }
+
+
 
     private Container<Action1<Integer>> container = new Container<>();
 
@@ -90,14 +131,14 @@ public class ActMain extends BaseActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        if(container != null && container.getT() != null)
+        if (container != null && container.getT() != null)
             container.getT().call(1);
     }
 
     @Override
     protected void onPause() {
         super.onPause();
-        if(container != null && container.getT() != null)
+        if (container != null && container.getT() != null)
             container.getT().call(2);
     }
 
@@ -109,7 +150,7 @@ public class ActMain extends BaseActivity {
         super.onDestroy();
         KFZSNetwork.stopByTag(TAG);
         EventBus.getDefault().unregister(this);
-        if(container != null && container.getT() != null)
+        if (container != null && container.getT() != null)
             container.setT(null);
     }
 
@@ -155,4 +196,29 @@ public class ActMain extends BaseActivity {
         super.onActivityResult(requestCode, resultCode, data);
         UMShareAPI.get(this).onActivityResult(requestCode, resultCode, data);
     }
+
+    @Override
+    public void positionClick(int position) {
+        switch (position) {
+            case 0://赚钱
+                setStatusSC();
+                break;
+            /*case 1://审核
+                setStatusVI();
+                break;
+            case 2://邀请
+                setStatusVI();
+                break;
+            case 3://发现
+                setStatusVI();
+                break;
+            case 4://个人中心
+                setStatusVI();
+                break;*/
+            default:
+                setStatusVI();
+                break;
+
+        }
+    }
 }

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

@@ -184,7 +184,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
      * @return 是否显示红包
      */
     private void isShowRedPackage() {
-        //  DataUtil.getInstance().是官方包吗();
+         // DataUtil.getInstance().是官方包吗();
         if (userEntity == null) {
             userEntity = DataUtil.getInstance().getUserEntity();
         }
@@ -314,8 +314,8 @@ public class FgtPersonalCenter extends BaseCompatFragment {
     })
     public void onViewClicked(View view) {
         switch (view.getId()) {
-            case R.id.ibtn_baseactivity_message:
-              //  startActivity(new Intent(activity, ActivityMessages.class));
+            case R.id.ibtn_baseactivity_message://消息
+               // startActivity(new Intent(activity, ActivityMessages.class));
                 break;
             case R.id.iv_redpackage://邀请成功后有可领红包
                 ViewUtil.changeRedPackage(getActivity(), getView(), FgtPersonalCenter.this);
@@ -392,6 +392,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
 
     @Override
     public void onResume() {
+        isShowRedPackage();
         super.onResume();
         try {
             initData();

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

@@ -7,10 +7,12 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
+import android.support.annotation.RequiresApi;
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
 import android.support.v4.widget.NestedScrollView;
@@ -24,7 +26,11 @@ import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.OvershootInterpolator;
+import android.view.animation.TranslateAnimation;
 import android.widget.AdapterView;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
@@ -258,10 +264,173 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
         }
     };
+    /**
+     * @return 是否显示兑换邀请码红包
+     */
+    private void isShowRedPackageWithCode() {
+        //  DataUtil.getInstance().是官方包吗();
+        if (userEntity == null) {
+            userEntity = DataUtil.getInstance().getUserEntity();
+        }
+        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();
+                }
+            }
+        });
+        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对象
+     *
+     * @param obj ,Context对象
      */
     public void isShowRedPackages(Context obj) {
         if (userEntity == null) {
@@ -280,13 +449,12 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         if (userEntity == null) {
             userEntity = DataUtil.getInstance().getUserEntity();
         }
-        if(userEntity == null){
-            return;
-        }
-        if (SpUtils.getFirst("first"+userEntity.getId())) {
+
+        if (SpUtils.getFirst("first" + userEntity.getId())) {//不是第一次进入APP
+            isShowRedPackageWithCode();//虽然不是第一次，但是邀请码的那个红包还是让它显示
             return;
         }
-        SpUtils.saveFirst("first"+userEntity.getId(), true);
+        SpUtils.saveFirst("first" + userEntity.getId(), true);//第一次登录成功后保存起来，下次进来就不再弹新人红包
         if (((userEntity.getNewbie_task_status() & 16) == 0) && userEntity.getIs_new() == 1) {
             showRedPackage(getContext());
         }
@@ -356,10 +524,23 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             }
         });
         CommonUtil.getInstance().reflex(tabLayout, activity);
+        setAnimation(ivDuty);
     }
 
     private int curPosition = 0;
 
+    /**
+     * 给请红包浮标设置动画，达到左右晃动
+     * @param imageView  设置动画的imageview
+     */
+    private void setAnimation(ImageView imageView) {
+        TranslateAnimation animation = new TranslateAnimation(0, -5, 0, 0);
+        animation.setInterpolator(new OvershootInterpolator());
+        animation.setDuration(150);
+        animation.setRepeatCount(Integer.MAX_VALUE);//根据产品要求，要一直晃动
+        animation.setRepeatMode(Animation.REVERSE);
+        imageView.startAnimation(animation);
+    }
 
     private void loadUserInfo() {
 
@@ -907,6 +1088,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         if(onResumeCount > 0)
             refreshTaskList();
         onResumeCount++;
+        setAnimation(ivDuty);
     }
 
 
@@ -1254,6 +1436,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             @Override
             public void onClick(View view) {
                 popupWindow.dismiss();
+                isShowRedPackageWithCode();//关闭新人注册红包后，弹出邀请红包
             }
         });
 
@@ -1279,11 +1462,13 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     public void onNext(BaseMessage baseMessage) {
                         if (popupWindow.isShowing()){
                             popupWindow.dismiss();
+                            isShowRedPackageWithCode();//兑换成功后弹出邀请红包
                         }
                         CommonUtil.getInstance().updateUserInfo(null);
                     }
                 });
     }
+
     /**
      * 新手任务
      */

app/src/main/java/com/kfzs/duanduan/react/TabsHelper.java

@@ -53,7 +53,12 @@ public class TabsHelper {
 
     private ViewPager view_pager_container;
     private TextView mTxtToolBar;
-
+    private ItemPosition itemPosition;
+    public TabsHelper() {
+    }
+    public TabsHelper(ItemPosition itemPosition) {
+        this.itemPosition = itemPosition;
+    }
 
     private void initViews() {
         activity = KFZSApp.actMain;
@@ -149,12 +154,19 @@ public class TabsHelper {
      * @param position
      */
     private void checkWhichPage(int position){
-        if(position == MainTab.FgtSmallSheep.ordinal()) {
+        if(position == MainTab.FgtSmallSheep.ordinal()) {//赚钱
+            itemPosition.positionClick(0);
             UMConfigUtils.Event.TAB_SHEEP.onEvent();
-        }else if(position == MainTab.Fgt_Find.ordinal()) {
+        }else if(position == MainTab.Fgt_Find.ordinal()) {//发现
+            itemPosition.positionClick(1);
             UMConfigUtils.Event.TAB_FIND.onEvent();
-        }else if(position == MainTab.FgtPersonnalCenter.ordinal()) {
+        }else if(position == MainTab.FgtPersonnalCenter.ordinal()) {//个人中心
+            itemPosition.positionClick(2);
             UMConfigUtils.Event.TAB_USER.onEvent();
+        }else if (position==MainTab.FgtMainAudit.ordinal()){//审核
+            itemPosition.positionClick(3);
+        }else if(position==MainTab.FgtMainAskGetMoney.ordinal()){//邀请
+            itemPosition.positionClick(4);
         }
     }
 
@@ -193,7 +205,7 @@ public class TabsHelper {
 
     private void initViewPager() {
         LogUtil.logI("fragmentList.size---"+fragmentList.size());
-        ViewPagerFragmentAdapter mViewPagerFragmentAdapter = new ViewPagerFragmentAdapter(activity.getSupportFragmentManager(),fragmentList);
+        ViewPagerFragmentAdapter mViewPagerFragmentAdapter = new ViewPagerFragmentAdapter(activity.getSupportFragmentManager(), fragmentList);
         view_pager_container.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
 
             @Override
@@ -282,4 +294,14 @@ public class TabsHelper {
         tabs.get(postion).performClick();
     }
 
+    /**
+     * 设置获取当前是哪个fragment位置的回调
+     */
+   public interface ItemPosition{
+        /**
+         * @param position ,fragment的位置
+         */
+        void positionClick(int position);
+    }
+
 }

app/src/main/java/com/sheep/gamegroup/absBase/BaseActivity.java

@@ -27,21 +27,24 @@ public abstract class BaseActivity extends AppCompatActivity {
         initListener();
         initData();
     }
-    public boolean isShowing(){
+
+    public boolean isShowing() {
         return dialogLoading != null && dialogLoading.getAlertDialog() != null && dialogLoading.getAlertDialog().isShowing();
     }
-    public void  showProgress(){
+
+    public void showProgress() {
         hideProgress();
         dialogLoading = DialogLoading.showDialog(this);
     }
-    protected void  showProgress(boolean cancel){
+
+    protected void showProgress(boolean cancel) {
         hideProgress();
         dialogLoading = DialogLoading.showDialog(this, cancel);
     }
 
 
-    public void  hideProgress(){
-        if(isShowing()){
+    public void hideProgress() {
+        if (isShowing()) {
             try {
                 dialogLoading.getAlertDialog().dismiss();
             } catch (Exception e) {
@@ -51,13 +54,6 @@ public abstract class BaseActivity extends AppCompatActivity {
     }
 
 
-
-
-
-
-
-
-
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         /*if (BuildConfig.DEBUG)
@@ -78,5 +74,4 @@ public abstract class BaseActivity extends AppCompatActivity {
     public abstract void initData();
 
 
-
 }

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

@@ -15,6 +15,7 @@ import android.media.MediaPlayer;
 import android.net.Uri;
 import android.os.Build;
 import android.provider.MediaStore;
+import android.support.v4.app.FragmentActivity;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -1382,4 +1383,18 @@ public class ViewUtil {
         }
 
     }
+    /**
+     * 获取状态栏高度
+     *
+     * @return , 状态栏高度
+     * @param activity
+     */
+    public static int getBarHeight(FragmentActivity activity) {
+        int result = 0;
+        int resourceId = activity.getResources().getIdentifier("status_bar_height", "dimen", "android");
+        if (resourceId > 0) {
+            result = activity.getResources().getDimensionPixelSize(resourceId);
+        }
+        return result;
+    }
 }

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

@@ -1,13 +1,9 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.annotation.SuppressLint;
-import android.content.Context;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.AppCompatActivity;
 import android.view.LayoutInflater;
@@ -15,20 +11,19 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.sheep.gamegroup.view.fragment.FragmentMessageCenter;
+import com.sheep.gamegroup.view.adapter.MessageAdapter;
 import com.sheep.jiuyan.samllsheep.R;
 
 
 /**
  * created on：2018/8/28 on 11:44
  * created by: YSL
- * 描述:
+ * 描述:消息Activity，展示消息中心和互动消息两个模块
  */
 public class ActivityMessages extends AppCompatActivity {
-    public static final String[] mTabTitle = new String[]{"消息中心", "回复互动"};
-    public static final int[] mTabResDef = new int[]{R.drawable.shape_red_point_circle};
-    private TabLayout tabLayout=null;
-    private ViewPager viewPager=null;
+    private String[] mTitle = new String[]{"消息中心", "回复互动"};
+    private TabLayout tabLayout = null;
+    private ViewPager viewPager = null;
 
 
     @SuppressLint("WrongViewCast")
@@ -47,15 +42,14 @@ public class ActivityMessages extends AppCompatActivity {
                         tabView = getCustomView(i);
                         tabLayout.getTabAt(i).setCustomView(tabView);
                     }
-                    TextView tabTitle1 = tabView.findViewById(R.id.tv_message_left);
-                    TextView tabTitle2 = tabView.findViewById(R.id.tv_message_right);
-                    if (i == tab.getPosition()) {//选中
-                        tabTitle1.setTextSize(18);
-                        tabTitle2.setTextSize(10);
+                    TextView tvtable = tabView.findViewById(R.id.tv_message);
+                    ImageView ivtable = tabView.findViewById(R.id.iv_message);
+                    if (i == tab.getPosition()) {
+                        tvtable.setTextColor(Color.parseColor("#ff333333"));
                     } else {
-                        tabTitle1.setTextSize(10);
-                        tabTitle2.setTextSize(18);
+                        tvtable.setTextColor(Color.parseColor("#ff666666"));
                     }
+                    tvtable.setText(mTitle[i]);
                 }
             }
 
@@ -69,56 +63,27 @@ public class ActivityMessages extends AppCompatActivity {
 
             }
         });
-        viewPager.setAdapter(new MyAdapter(getSupportFragmentManager(), this));
+        viewPager.setAdapter(new MessageAdapter(getSupportFragmentManager(), this));
         tabLayout.setupWithViewPager(viewPager);
+        //返回
+        findViewById(R.id.iv_back).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                ActivityMessages.this.finish();
+            }
+        });
     }
 
+    /**
+     * 、
+     * 设置每个tab的view，可根据position的不同，针对性的对每个tab做处理，这里消息互动和消息中心的tab布局一样，所以就统一设置
+     *
+     * @param position tab的位置
+     * @return ，tab的view
+     */
     private View getCustomView(int position) {
         View view = LayoutInflater.from(this).inflate(R.layout.layout_fragment_mseeages, null, false);
-        ImageView tabIcon1 = view.findViewById(R.id.iv_message_left);
-        ImageView tabIcon2 = view.findViewById(R.id.iv_message_right);
-        TextView tabTitle1 = view.findViewById(R.id.tv_message_left);
-        TextView tabTitle2 = view.findViewById(R.id.tv_message_right);
-        if (position == 0) {
-            tabTitle1.setTextSize(18);
-            tabTitle2.setTextSize(10);
-        } else if (position == 1) {
-            tabTitle1.setTextSize(10);
-            tabTitle2.setTextSize(18);
-        }
         return view;
     }
 }
 
-
-class MyAdapter extends FragmentPagerAdapter {
-    private Fragment fragmentLeft, fragmentRight;
-    private Context context;
-
-    public MyAdapter(FragmentManager fm, Context context) {
-        super(fm);
-        this.context = context;
-    }
-
-    @Override
-    public Fragment getItem(int position) {
-        if (position == 0) {
-            if (fragmentLeft != null) {
-                return new FragmentMessageCenter(context);
-            } else {
-                return fragmentLeft;
-            }
-        } else {
-            if (fragmentRight != null) {
-                return new FragmentMessageCenter(context);
-            } else {
-                return fragmentRight;
-            }
-        }
-    }
-
-    @Override
-    public int getCount() {
-        return 2;
-    }
-}

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

@@ -1,35 +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 com.sheep.jiuyan.samllsheep.R;
-
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-
-/**
- * created on：2018/8/28 on 17:15
- * created by: YSL
- * 描述:消息互动中item点击展开后的activity
- */
-public class MessageInteractionActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_message_interaction);
-        ButterKnife.bind(this);
-    }
-
-    @OnClick({R.id.img_baseactivity_title})
-    public void initClick(View view) {
-        switch (view.getId()) {
-            case R.id.img_baseactivity_title:
-                MessageInteractionActivity.this.finish();
-                break;
-        }
-    }
-}

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

@@ -0,0 +1,56 @@
+package com.sheep.gamegroup.view.activity;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.OrientationHelper;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.sheep.gamegroup.view.adapter.MessageInteractionAdapter;
+import com.sheep.jiuyan.samllsheep.R;
+
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+/**
+ * created on：2018/8/28 on 17:15
+ * created by: YSL
+ * 描述:互动消息详情Activity
+ */
+public class MessageInteractionDetailActivity extends AppCompatActivity {
+    @BindView(R.id.txt_baseactivity_title)
+    TextView tvTitle;
+    @BindView(R.id.recycle_view)
+    RecyclerView recyclerView;
+    private MessageInteractionAdapter adapter;
+    private List<?> mList;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_message_interaction);
+        ButterKnife.bind(this);
+        tvTitle.setText("回复详情");
+        LinearLayoutManager manager = new LinearLayoutManager(this);
+        manager.setOrientation(OrientationHelper.VERTICAL);
+        recyclerView.setLayoutManager(manager);
+        adapter = new MessageInteractionAdapter(this, mList);
+        recyclerView.setAdapter(adapter);
+    }
+
+    @OnClick({R.id.img_baseactivity_title})
+    public void initClick(View view) {
+        switch (view.getId()) {
+            case R.id.img_baseactivity_title:
+                MessageInteractionDetailActivity.this.finish();
+                break;
+        }
+    }
+}

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

@@ -4,11 +4,9 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.sheep.jiuyan.samllsheep.R;
-import com.umeng.commonsdk.debug.I;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -17,9 +15,9 @@ import butterknife.OnClick;
 /**
  * created on：2018/8/28 on 17:55
  * created by: YSL
- * 描述:
+ * 描述:消息回复详情Activity
  */
-public class MessageSystemActivity extends AppCompatActivity {
+public class MessageReplyDetailActivity extends AppCompatActivity {
     @BindView(R.id.tv_content)
     TextView tvContent;
     @BindView(R.id.tv_title)
@@ -39,7 +37,7 @@ public class MessageSystemActivity extends AppCompatActivity {
     public void initClick(View view) {
         switch (view.getId()) {
             case R.id.img_baseactivity_title:
-                MessageSystemActivity.this.finish();
+                MessageReplyDetailActivity.this.finish();
                 break;
         }
 

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

@@ -6,6 +6,7 @@ import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.kfzs.duanduan.BaseCompatFragment;
@@ -13,8 +14,10 @@ import com.kfzs.duanduan.mine.GiftpackListAdapter;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.TaskAuditEntity;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import butterknife.BindView;

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/FragmentMessageCenter.java

@@ -2,6 +2,7 @@ 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;
@@ -12,34 +13,37 @@ 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.MessageInteractionDetailActivity;
 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 on：2018/8/29 on 9:58
  * created by: YSL
  * 描述:
  */
+
 @SuppressLint("ValidFragment")
-public class FragmentMessageCenter extends Fragment implements MessageLeftAdapter.ItemOnClickListener{
+public class MessageReplyFragment extends Fragment implements MessageLeftAdapter.ItemOnClickListener {
     private Context mContext;
     private RecyclerView recyclerView;
     private MessageLeftAdapter adapter;
-    private List<?>mList;
+    private List<?> mList;
+
+    public MessageReplyFragment() {
+    }
 
-    public FragmentMessageCenter(Context mContext) {
+    public MessageReplyFragment(Context mContext) {
         this.mContext = mContext;
     }
 
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = LayoutInflater.from(mContext).inflate(R.layout.fragment_messagecenter, null);
+        View view = inflater.inflate(R.layout.fragment_messagecenter, null);
         recyclerView = view.findViewById(R.id.recycle_fragment_message_center);
         return view;
     }
@@ -47,8 +51,8 @@ public class FragmentMessageCenter extends Fragment implements MessageLeftAdapte
     @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);
+        adapter = new MessageLeftAdapter(mContext, mList, this);
+        LinearLayoutManager manager = new LinearLayoutManager(mContext);
         manager.setOrientation(OrientationHelper.VERTICAL);
         recyclerView.setLayoutManager(manager);
         recyclerView.setAdapter(adapter);
@@ -56,6 +60,8 @@ public class FragmentMessageCenter extends Fragment implements MessageLeftAdapte
 
     @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

@@ -6,6 +6,6 @@
         android:topRightRadius="10dp"
         android:bottomRightRadius="10dp"/>
     <stroke
-        android:width="1dp"
+        android:width="1px"
         android:color="#4889FF" />
 </shape>

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

@@ -5,5 +5,5 @@
         android:width="30dp"
         android:height="30dp" />
     <corners android:radius="30dp" />
-    <solid android:color="@color/red" />
+    <solid android:color="#fff81b5f" />
 </shape>

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

@@ -6,6 +6,6 @@
         android:topRightRadius="10dp"
         android:bottomRightRadius="10dp"/>
     <stroke
-        android:width="1dp"
+        android:width="1px"
         android:color="#F07422" />
 </shape>

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

@@ -6,6 +6,7 @@
         android:topRightRadius="10dp"
         android:bottomRightRadius="10dp"/>
     <stroke
-        android:width="1dp"
+        android:width="1px"
         android:color="#FD2D54" />
+
 </shape>

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

@@ -6,7 +6,13 @@
     android:background="@color/white"
     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"
@@ -115,17 +121,9 @@
         </LinearLayout>
     </android.support.constraint.ConstraintLayout>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:background="@color/white"
-        android:orientation="vertical">
-
-        <android.support.design.widget.TabLayout
-            android:id="@+id/indicator"
-            style="@style/style_tab"/>
-        <include layout="@layout/line_1px_hor" />
-    </LinearLayout>
+    <android.support.design.widget.TabLayout
+        android:id="@+id/indicator"
+        style="@style/style_tab"/>
 
     <android.support.v4.view.ViewPager
         android:id="@+id/pager"

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

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
+    android:layout_height="match_parent">
 
     <include layout="@layout/act_find"/>
     <LinearLayout
@@ -11,7 +10,6 @@
         android:layout_height="match_parent"
         android:layout_marginBottom="@dimen/bottom_height"
         android:clipToPadding="true"
-        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
         <com.kfzs.duanduan.view.NoScrollViewPager

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

@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/white_F9F9F9"
     android:orientation="vertical">
 
@@ -38,7 +39,10 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_toLeftOf="@id/iv_right"
-            android:layout_toRightOf="@+id/iv_back" />
+            android:layout_marginStart="60dp"
+            android:layout_marginEnd="60dp"
+            android:layout_toRightOf="@+id/iv_back"
+            app:tabIndicatorHeight="0dp" />
 
 
     </RelativeLayout>

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

@@ -34,11 +34,12 @@
 
     <TextView
         android:id="@+id/gridview_item_tag_tv"
-        android:layout_width="wrap_content"
+        android:layout_width="35dp"
         android:layout_height="wrap_content"
         android:text="试玩"
-        android:textSize="9sp"
+        android:textSize="7sp"
+        android:gravity="center"
+        android:padding="2dp"
         android:textColor="@color/black_6_3"
-        android:padding="@dimen/content_padding_3"
         android:layout_toRightOf="@+id/linearlayout"/>
 </RelativeLayout>

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

@@ -5,7 +5,12 @@
     android:background="@color/bg_gray"
     android:orientation="vertical">
 
-    <include layout="@layout/title"/>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginTop="24dp" />
+
+    <include layout="@layout/title" />
 
     <android.support.design.widget.TabLayout
         android:id="@+id/indicator"

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

@@ -55,12 +55,11 @@
                 android:layout_height="40dp"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentBottom="true"
+                android:layout_marginEnd="16dp"
                 android:background="@color/translate"
                 android:src="@mipmap/setting" />
 
 
-
-
             <include
                 layout="@layout/title_bottom_line"
                 android:layout_width="match_parent"

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

@@ -5,10 +5,12 @@
     android:scrollbars="none">
 
     <LinearLayout
+        android:id="@+id/root_4"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/bg_gray"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:layout_marginTop="24dp">
 
         <include layout="@layout/fgt_personacenter_item_top" />
 

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

@@ -1,8 +1,9 @@
 <?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.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+
     <android.support.v7.widget.RecyclerView
         android:id="@+id/recycle_fragment_message_center"
         android:layout_width="match_parent"

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

@@ -50,10 +50,6 @@
 
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="10dp"
-                    android:background="#fff5f5f5" />
-                <View
-                    android:layout_width="match_parent"
                     android:layout_height="1dp"
                     android:layout_marginBottom="@dimen/dp_10"
                     android:background="#fff5f5f5" />

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/layout_fragment_mseeages.xml

@@ -1,48 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="60dp"
+    android:layout_height="wrap_content"
     android:orientation="horizontal">
 
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:orientation="horizontal">
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:gravity="center">
 
         <TextView
-            android:id="@+id/tv_message_left"
+            android:id="@+id/tv_message"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:gravity="center_vertical"
+            android:textColor="#ff666666"
+            android:textSize="15sp"
             android:text="消息中心" />
 
         <ImageView
-            android:id="@+id/iv_message_left"
+            android:id="@+id/iv_message"
             android:layout_width="10dp"
             android:layout_height="10dp"
-            android:layout_marginTop="20dp"
-            android:background="@drawable/shape_litter_red_circle" />
-    </LinearLayout>
+           android:layout_marginTop="20dp"
+            android:layout_marginStart="-5dp"
+            android:layout_toRightOf="@id/tv_message"
+            android:src="@drawable/shape_litter_red_circle" />
+    </RelativeLayout>
 
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:orientation="horizontal">
 
-        <TextView
-            android:id="@+id/tv_message_right"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:text="消息互动" />
-
-        <ImageView
-            android:id="@+id/iv_message_right"
-            android:layout_width="10dp"
-            android:layout_height="10dp"
-            android:layout_marginTop="20dp"
-            android:background="@drawable/shape_litter_red_circle" />
-    </LinearLayout>
 </LinearLayout>

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

@@ -12,7 +12,9 @@
 
         <android.support.design.widget.TabLayout
             android:id="@+id/tabLayout"
-            style="@style/style_tab"/>
+            style="@style/style_tab"
+            app:tabIndicatorHeight="2dp"
+            android:layout_height="48dp"/>
         <include layout="@layout/line_1px_hor" />
     </LinearLayout>
 

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

@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="60dp"
-        android:layout_marginTop="-60dp"
+        android:layout_marginTop="-36dp"
         android:orientation="vertical"
         android:fillViewport="true"
         android:layout_gravity="fill_vertical"

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

@@ -422,7 +422,7 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">36dp</item>
         <item name="tabBackground">@android:color/transparent</item>
-        <item name="tabIndicatorHeight">1dp</item>
+        <item name="tabIndicatorHeight">2dp</item>
         <item name="tabGravity">center</item>
         <item name="tabIndicatorColor">#2ebef2</item>
         <item name="tabMode">scrollable</item>

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

@@ -88,6 +88,6 @@
     <string name="my_invitation_str">我的邀请码:%s</string>
 
     <string name="homepage_award">你还有%s元的奖励未领取</string>
-    <string name="homepage_cash">现金任务：%s元</string>
-    <string name="homepage_welfare">游戏福利：%s元</string>
+    <string name="homepage_cash">现金任务:%s元</string>
+    <string name="homepage_welfare">游戏福利:%s元</string>
 </resources>