3.0二期优化点，

app/src/main/AndroidManifest.xml

@@ -578,6 +578,10 @@
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ActivityMessages"
             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,19 @@
 package com.kfzs.duanduan;
 
+import android.annotation.SuppressLint;
 import android.content.Intent;
+import android.graphics.Color;
+import android.os.Build;
 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,6 +25,8 @@ 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;
@@ -36,7 +44,6 @@ public class ActMain extends BaseActivity {
     private ImageView mImgDot;//下载按钮的小红点
 
 
-
     public TabsHelper tabsHelper;
 
     @Override
@@ -81,6 +88,9 @@ public class ActMain extends BaseActivity {
     }
 
 
+
+
+
     private Container<Action1<Integer>> container = new Container<>();
 
     public Container<Action1<Integer>> getContainer() {
@@ -90,14 +100,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 +119,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);
     }
 

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

@@ -315,7 +315,7 @@ 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));
+                startActivity(new Intent(activity, ActivityMessages.class));
                 break;
             case R.id.iv_redpackage://邀请成功后有可领红包
                 ViewUtil.changeRedPackage(getActivity(), getView(), FgtPersonalCenter.this);

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

@@ -26,6 +26,9 @@ 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.ImageView;
 import android.widget.LinearLayout;
@@ -223,12 +226,12 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     break;
                 case 1:
                     tryMakeMoneyAdp.clear();
-                    if(!ListUtil.isEmpty(allTaskAcceptedTaskList)){
-                        if(recyclerview_line != null)
+                    if (!ListUtil.isEmpty(allTaskAcceptedTaskList)) {
+                        if (recyclerview_line != null)
                             recyclerview_line.setVisibility(View.VISIBLE);
                         tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, allTaskAcceptedTaskList));
                     }
-                    if(!ListUtil.isEmpty(releaseEtyLists)) {
+                    if (!ListUtil.isEmpty(releaseEtyLists)) {
                         tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists));
                     }
                     tryMakeMoneyAdp.notifyDataSetChanged();
@@ -236,12 +239,12 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     break;
                 case 2:
                     FgtTryMakeMoney item = (FgtTryMakeMoney) adpViewPagerDetail.getItem(curPosition);
-                    if(mViewPager == null || item == null){
+                    if (mViewPager == null || item == null) {
                         return;
                     }
                     int count = item.getDataCount();
                     ViewGroup.LayoutParams params = mViewPager.getLayoutParams();
-                    params.height = count == 0 ? G.HEIGHT / 2 : (count * getResources().getDimensionPixelSize(R.dimen.content_padding_96)+getResources().getDimensionPixelSize(R.dimen.content_padding));
+                    params.height = count == 0 ? G.HEIGHT / 2 : (count * getResources().getDimensionPixelSize(R.dimen.content_padding_96) + getResources().getDimensionPixelSize(R.dimen.content_padding));
                     mViewPager.setLayoutParams(params);
                     break;
                 case 7:
@@ -254,7 +257,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
     /**
      * 新手任务对话框中，注册账号并登录得红包，这里判断是否已经领取过了，如果领取过了就不显示，不然就显示
-     * @param obj     ,Context对象
+     *
+     * @param obj ,Context对象
      */
     public void isShowRedPackages(Context obj) {
         if (userEntity == null) {
@@ -273,13 +277,13 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         if (userEntity == null) {
             userEntity = DataUtil.getInstance().getUserEntity();
         }
-        if(userEntity == null){
+        if (userEntity == null) {
             return;
         }
-        if (SpUtils.getFirst("first"+userEntity.getId())) {
+        if (SpUtils.getFirst("first" + userEntity.getId())) {
             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());
         }
@@ -325,7 +329,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
          */
         adpViewPagerDetail = new AdpTryMakemoney(getChildFragmentManager(), activity);
         adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(0, "is_hot"), "每日必做");
-        adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(1,"about_to_begin"), "即将开始");
+        adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(1, "about_to_begin"), "即将开始");
 
 //        mViewPager.setOffscreenPageLimit(2);
         mViewPager.setAdapter(adpViewPagerDetail);
@@ -350,10 +354,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() {
 
@@ -433,7 +450,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
         //用户信息
         userEntity = DataUtil.getInstance().getUserEntity();
-        if(userEntity != null){
+        if (userEntity != null) {
             loadUserInfo();
         }
         //任务
@@ -446,13 +463,13 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
         //实时动态
         List<MoreDataEntity> cacheMoreDataEtyList = DataUtil.getInstance().getCacheList(ApiKey.award_detail, MoreDataEntity.class);
-        if(!ListUtil.isEmpty(cacheMoreDataEtyList)){
+        if (!ListUtil.isEmpty(cacheMoreDataEtyList)) {
             invite(cacheMoreDataEtyList);
         }
 
         //公告
         List<BulletinEnty> cacheBulletinEtyList = DataUtil.getInstance().getCacheList(ApiKey.bulletin, BulletinEnty.class);
-        if(ListUtil.isEmpty(cacheBulletinEtyList)){
+        if (ListUtil.isEmpty(cacheBulletinEtyList)) {
             homepageItemNoticeLayout.setVisibility(View.GONE);
         } else {
             bulletinEntyLists.clear();
@@ -461,7 +478,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
         //轮播
         List<SlideshowEty> cacheSlideshowEtyList = DataUtil.getInstance().getCacheList(ApiKey.slideshow, SlideshowEty.class);
-        if(ListUtil.isEmpty(cacheSlideshowEtyList)){
+        if (ListUtil.isEmpty(cacheSlideshowEtyList)) {
             banner.setVisibility(View.GONE);
         } else {
             for (SlideshowEty slideshowEty : cacheSlideshowEtyList) {
@@ -473,7 +490,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
         //首页list
         List<HomeListEntity> cacheHomeListEtyList = DataUtil.getInstance().getCacheList(ApiKey.home_list, HomeListEntity.class);
-        if(ListUtil.isEmpty(cacheHomeListEtyList)){
+        if (ListUtil.isEmpty(cacheHomeListEtyList)) {
             home_list_gridview_layout.setVisibility(View.GONE);
         } else {
             home_list_gridview_layout.setVisibility(View.VISIBLE);
@@ -544,21 +561,21 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             @Override
             public void call(BaseMessage o) {
 
-                if(o != null){
+                if (o != null) {
                     CashAwarsEntity cashAwarsEntity = o.getData(CashAwarsEntity.class);
-                    if(cashAwarsEntity != null){
-
-                        String award = String.format(activity.getResources().getString(R.string.homepage_award), FormatAny.getInstance().formatString(cashAwarsEntity.getAward()+""));
-                        String cash = String.format(activity.getResources().getString(R.string.homepage_cash), FormatAny.getInstance().formatString(cashAwarsEntity.getCash()+""));
-                        String welfare = String.format(activity.getResources().getString(R.string.homepage_welfare), FormatAny.getInstance().formatString(cashAwarsEntity.getWelfare()+""));
-                        homepage_item_get_award_name_tv.setText(award+"");
-                        homepage_item_money_tv.setText(cash+"");
-                        homepage_item_juan_tv.setText(welfare+"");
+                    if (cashAwarsEntity != null) {
+
+                        String award = String.format(activity.getResources().getString(R.string.homepage_award), FormatAny.getInstance().formatString(cashAwarsEntity.getAward() + ""));
+                        String cash = String.format(activity.getResources().getString(R.string.homepage_cash), FormatAny.getInstance().formatString(cashAwarsEntity.getCash() + ""));
+                        String welfare = String.format(activity.getResources().getString(R.string.homepage_welfare), FormatAny.getInstance().formatString(cashAwarsEntity.getWelfare() + ""));
+                        homepage_item_get_award_name_tv.setText(award + "");
+                        homepage_item_money_tv.setText(cash + "");
+                        homepage_item_juan_tv.setText(welfare + "");
                     }
                 }
             }
         });
-        if(!isFirst){
+        if (!isFirst) {
             for (int i = 0; i < adpViewPagerDetail.getCount(); i++) {
                 FgtTryMakeMoney item = (FgtTryMakeMoney) adpViewPagerDetail.getItem(i);
                 item.refreshData();
@@ -594,14 +611,14 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         home_list_gridview_gv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                HomeListEntity homeListEntity= ListUtil.getItem(homeListEntitysGridview, position);
-                if(homeListEntity == null){
+                HomeListEntity homeListEntity = ListUtil.getItem(homeListEntitysGridview, position);
+                if (homeListEntity == null) {
                     return;
                 }
                 UMConfigUtils.IdEvent.HOME_LIST.commit(homeListEntity.getId());
-                if("-2".equals(homeListEntity.getJump())){
+                if ("-2".equals(homeListEntity.getJump())) {
                     setValueList(!homeListEntity.isSelect());
-                }else {
+                } else {
                     CommonUtil.getInstance()
                             .goWhere(activity, homeListEntity, "首页");
                 }
@@ -621,7 +638,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                                 1,
                                 0,
                                 0,
-                                 "-1",
+                                "-1",
                                 3));
 //        tryMakeMoneyPresenter.releaseTask(parameEty);
     }
@@ -668,7 +685,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
         BaseMessage baseMessage = (BaseMessage) o;
         userEntity = baseMessage.getData(UserEntity.class);
-        if(userEntity == null){
+        if (userEntity == null) {
             return;
         }
         DataUtil.getInstance().setUserEntity(userEntity);
@@ -711,7 +728,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @Override
     public void returnTaskTaskUpdataView(Object object) {
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.new_run_task(is_succession, show_game_task));
-        if(isNewData) {
+        if (isNewData) {
             BaseMessage baseMessage = (BaseMessage) object;
             allTaskAcceptedTaskList = baseMessage.getDataList(TaskAcceptedEty.class);
             AutoTaskListUtil.getInstance().loadList(allTaskAcceptedTaskList);
@@ -745,7 +762,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @Override
     public void releaseTaskTaskUpdataView(Object object) {
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.release_task);
-        if(isNewData && object instanceof BaseMessage) {
+        if (isNewData && object instanceof BaseMessage) {
             List<TaskReleaseEty> releaseEtyList = ((BaseMessage) object).getDataList(TaskReleaseEty.class);
             if (releaseEtyList != null) {
                 releaseEtyLists = releaseEtyList;
@@ -783,7 +800,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @Override
     public void successSlideshow(BaseMessage baseMessage) {
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.slideshow);
-        if(isNewData){
+        if (isNewData) {
             List<SlideshowEty> slideshowEtyList = baseMessage.getDataList(SlideshowEty.class);
             if (ListUtil.isEmpty(slideshowEtyList)) {
                 banner.setVisibility(View.GONE);
@@ -808,7 +825,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @Override
     public void successbulletin(BaseMessage baseMessage) {
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.bulletin);
-        if(isNewData){
+        if (isNewData) {
             List<BulletinEnty> bulletinEntyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), BulletinEnty.class);
             if (ListUtil.isEmpty(bulletinEntyList)) {
                 homepageItemNoticeLayout.setVisibility(View.GONE);
@@ -824,7 +841,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     public void successhomeList(BaseMessage baseMessage) {
         checkAndInitView();
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.home_list);
-        if(isNewData){
+        if (isNewData) {
             List<HomeListEntity> homeListEntityList = baseMessage.getDataList(HomeListEntity.class);
             if (ListUtil.isEmpty(homeListEntityList)) {
                 home_list_gridview_layout.setVisibility(View.GONE);
@@ -884,11 +901,11 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     public void onResume() {
         super.onResume();
         UserEntity result = DataUtil.getInstance().getUserEntity();
-        if(result == null) {
+        if (result == null) {
             CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
                 @Override
                 public void call(UserEntity item) {
-                    if(item != null) {
+                    if (item != null) {
                         userEntity = item;
                         loadUserInfo();
                     }
@@ -898,7 +915,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             userEntity = result;
             loadUserInfo();
         }
-        if(DataUtil.getInstance().isTaskListChange(getClass()))//数据变化才刷新
+        if (DataUtil.getInstance().isTaskListChange(getClass()))//数据变化才刷新
             refreshTaskList();
     }
 
@@ -1161,7 +1178,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
      * 点击一条公告
      */
     private void onClickNotice(BulletinEnty item) {
-        switch (item.getJumpType()){// 跳转类型:11,任务 98,内部h5 99,外部h5
+        switch (item.getJumpType()) {// 跳转类型:11,任务 98,内部h5 99,外部h5
             case 11:
                 Jump2View.getInstance().goTaskDetailView(activity, NumberFormatUtils.parseInteger(item.getJumpValue()));
                 break;
@@ -1211,7 +1228,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
      * 邀请成功后在个人资料显示领红包弹窗
      */
     public void showRedPackage(Context context) {
-        Activity mActivity = (Activity)context;
+        Activity mActivity = (Activity) context;
         View viewAnchor = LayoutInflater.from(context).inflate(R.layout.homepage_act_layout, null, false);
         View view = LayoutInflater.from(context).inflate(R.layout.dialog_redpackage_after_invitation, null, false);
         TextView tvGetRedPackage = view.findViewById(R.id.tv_get_redpackage);
@@ -1270,19 +1287,20 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        if (popupWindow.isShowing()){
+                        if (popupWindow.isShowing()) {
                             popupWindow.dismiss();
                         }
                         CommonUtil.getInstance().updateUserInfo(null);
                     }
                 });
     }
+
     /**
      * 新手任务
      */
-    private void addNewTask(){
+    private void addNewTask() {
 
-        if(onResumeCount == 0 && CommonUtil.getInstance().addNewTask(activity,userEntity) && homeListEntitysGridview != null)//第一次才调用
+        if (onResumeCount == 0 && CommonUtil.getInstance().addNewTask(activity, userEntity) && homeListEntitysGridview != null)//第一次才调用
         {
             HomeListEntity homeListEntityNewTask = new HomeListEntity();
             homeListEntityNewTask.setTitle("新手任务");
@@ -1291,12 +1309,12 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             homeListEntityNewTask.setIcon(R.mipmap.homepage_xinshourw + "");
             homeListEntitys.add(0, homeListEntityNewTask);
         }
-        if(homeListEntitys.size() > 8){
+        if (homeListEntitys.size() > 8) {
             HomeListEntity homeListEntity = new HomeListEntity();
             homeListEntity.setTitle("查看更多");
             homeListEntity.setDesc("查看更多");
             homeListEntity.setJump("-2");
-            homeListEntity.setIcon(R.mipmap.homepage_chakangd+"");
+            homeListEntity.setIcon(R.mipmap.homepage_chakangd + "");
             homeListEntitys.add(7, homeListEntity);
         }
         setValueList(false);
@@ -1304,28 +1322,28 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
     private void setValueList(boolean flag) {
         homeListEntitysGridview.clear();
-        for(int i=0;i<homeListEntitys.size();i++){
-            if(flag){
+        for (int i = 0; i < homeListEntitys.size(); i++) {
+            if (flag) {
                 homeListEntitysGridview.add(homeListEntitys.get(i));
-            }else {
-                if(i<8){
+            } else {
+                if (i < 8) {
                     homeListEntitysGridview.add(homeListEntitys.get(i));
                 }
             }
 
         }
-        if(homeListEntitysGridview.size() > 8){
+        if (homeListEntitysGridview.size() > 8) {
             HomeListEntity homeListEntity = new HomeListEntity();
             homeListEntity.setJump("-2");
             homeListEntity.setSelect(flag);
             if (flag) {
                 homeListEntity.setTitle("收起模块");
                 homeListEntity.setDesc("收起模块");
-                homeListEntity.setIcon(R.mipmap.homepage_chakangd_click+"");
+                homeListEntity.setIcon(R.mipmap.homepage_chakangd_click + "");
             } else {
                 homeListEntity.setTitle("查看更多");
                 homeListEntity.setDesc("查看更多");
-                homeListEntity.setIcon(R.mipmap.homepage_chakangd+"");
+                homeListEntity.setIcon(R.mipmap.homepage_chakangd + "");
             }
             homeListEntitysGridview.set(7, homeListEntity);
         }

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

@@ -1308,14 +1308,14 @@ public class ViewUtil {
                 textView.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_no_lb);
                 textView.setTextColor(context.getResources().getColor(R.color.red_FD2D54));
                 textView.setText("现金");
-                textView.setPadding(4 * padding, padding, 4 * padding, padding);
+               // textView.setPadding(2 * padding, padding, 1 * padding, padding);
                 break;
             case 4:
                 textView.setVisibility(View.VISIBLE);
                 textView.setBackgroundResource(R.drawable.shape_red_f07422_stroke_retangle_no_lb);
                 textView.setTextColor(context.getResources().getColor(R.color.red_F07422));
                 textView.setText("活跃");
-                textView.setPadding(4 * padding, padding, 4 * padding, padding);
+              //  textView.setPadding(2 * padding, padding, 1 * padding, padding);
                 break;
         }
 

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

@@ -0,0 +1,75 @@
+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);
+        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/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">
 
     <LinearLayout
         android:id="@+id/other_container"
@@ -10,7 +9,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/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

@@ -6,167 +6,174 @@
     android:background="@color/white"
     android:clipChildren="true">
 
-    <com.sheep.gamegroup.util.SheepSwipeRefreshLayout
-        android:id="@+id/refresh"
+
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true">
 
-        <android.support.v4.widget.NestedScrollView
-            android:id="@+id/scrollView"
+        <com.sheep.gamegroup.util.SheepSwipeRefreshLayout
+            android:id="@+id/refresh"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="fill_vertical"
-            android:fillViewport="true"
-            android:scrollbars="none"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior">
+            android:layout_height="wrap_content">
 
-            <LinearLayout
+            <android.support.v4.widget.NestedScrollView
+                android:id="@+id/scrollView"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:focusable="true"
-                android:focusableInTouchMode="true"
-                android:orientation="vertical">
+                android:layout_height="match_parent"
+                android:layout_gravity="fill_vertical"
+                android:fillViewport="true"
+                android:scrollbars="none"
+                app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-                <include
-                    layout="@layout/homepage_item_top2"
-                    android:visibility="gone" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:orientation="vertical">
 
-                <include layout="@layout/check_net_view" />
+                    <include
+                        layout="@layout/homepage_item_top2"
+                        android:visibility="gone" />
 
-                <include layout="@layout/homepage_item_banner" />
+                    <include layout="@layout/check_net_view" />
 
-                <include
-                    layout="@layout/homepage_item_gridview_listview"
-                    android:visibility="visible" />
+                    <include layout="@layout/homepage_item_banner" />
 
-                <include layout="@layout/homepage_item_notice_and_currenttime" />
+                    <include
+                        layout="@layout/homepage_item_gridview_listview"
+                        android:visibility="visible" />
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="10dp"
-                    android:background="#fff5f5f5" />
+                    <include layout="@layout/homepage_item_notice_and_currenttime" />
 
-                <include layout="@layout/homepage_item_get_award" />
+                    <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" />
+                    <include layout="@layout/homepage_item_get_award" />
 
-                <include
-                    layout="@layout/homepage_item_notice"
-                    android:visibility="gone" />
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:layout_marginBottom="@dimen/dp_10"
+                        android:background="#fff5f5f5" />
 
-                <include
-                    layout="@layout/homepage_item_currenttime_reward"
-                    android:visibility="gone" />
+                    <include
+                        layout="@layout/homepage_item_notice"
+                        android:visibility="gone" />
 
-                <include
-                    layout="@layout/homepage_item_4module"
-                    android:visibility="gone" />
+                    <include
+                        layout="@layout/homepage_item_currenttime_reward"
+                        android:visibility="gone" />
 
-                <include
-                    layout="@layout/homepage_item_liy_q"
-                    android:visibility="gone" />
+                    <include
+                        layout="@layout/homepage_item_4module"
+                        android:visibility="gone" />
 
-                <include
-                    layout="@layout/homepage_item_gridview_listview"
-                    android:visibility="gone" />
+                    <include
+                        layout="@layout/homepage_item_liy_q"
+                        android:visibility="gone" />
 
-                <android.support.v7.widget.RecyclerView
-                    android:id="@+id/recyclerview"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingLeft="3dp"
-                    android:paddingRight="3dp" />
+                    <include
+                        layout="@layout/homepage_item_gridview_listview"
+                        android:visibility="gone" />
 
-                <View
-                    android:id="@+id/recyclerview_line"
-                    android:layout_width="match_parent"
-                    android:layout_height="10dp"
-                    android:layout_marginBottom="@dimen/content_padding_8"
-                    android:layout_marginTop="@dimen/content_padding_8"
-                    android:background="#fff5f5f5"
-                    android:visibility="gone" />
-
-                <!--选项卡-->
-                <include layout="@layout/tablayout_viewpager_layout" />
-
-                <include layout="@layout/find_item_bottom"/>
-
-            </LinearLayout>
-
-        </android.support.v4.widget.NestedScrollView>
-    </com.sheep.gamegroup.util.SheepSwipeRefreshLayout>
-
-    <com.kfzs.duanduan.view.DragRelativeLayout
-        android:id="@+id/newbie_task"
-        android:layout_width="40dp"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginBottom="@dimen/content_padding_20"
-        android:layout_marginEnd="@dimen/content_padding_10"
-        android:gravity="center"
-        android:paddingBottom="@dimen/content_padding_10"
-        android:paddingTop="@dimen/content_padding_10"
-        android:visibility="gone">
-
-        <ImageView
-            android:id="@+id/bg_newbie_task"
-            android:layout_width="match_parent"
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/recyclerview"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:paddingLeft="3dp"
+                        android:paddingRight="3dp" />
+
+                    <View
+                        android:id="@+id/recyclerview_line"
+                        android:layout_width="match_parent"
+                        android:layout_height="10dp"
+                        android:layout_marginBottom="@dimen/content_padding_8"
+                        android:layout_marginTop="@dimen/content_padding_8"
+                        android:background="#fff5f5f5"
+                        android:visibility="gone" />
+
+                    <!--选项卡-->
+                    <include layout="@layout/tablayout_viewpager_layout" />
+
+                    <include layout="@layout/find_item_bottom" />
+
+                </LinearLayout>
+
+            </android.support.v4.widget.NestedScrollView>
+        </com.sheep.gamegroup.util.SheepSwipeRefreshLayout>
+
+        <com.kfzs.duanduan.view.DragRelativeLayout
+            android:id="@+id/newbie_task"
+            android:layout_width="40dp"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginBottom="@dimen/content_padding_20"
+            android:layout_marginEnd="@dimen/content_padding_10"
+            android:gravity="center"
+            android:paddingBottom="@dimen/content_padding_10"
+            android:paddingTop="@dimen/content_padding_10"
+            android:visibility="gone">
+
+            <ImageView
+                android:id="@+id/bg_newbie_task"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:adjustViewBounds="true"
+                android:scaleType="fitXY" />
+        </com.kfzs.duanduan.view.DragRelativeLayout>
+
+        <com.kfzs.duanduan.view.DragRelativeLayout
+            android:id="@+id/view_rob_duty"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:adjustViewBounds="true"
-            android:scaleType="fitXY" />
-    </com.kfzs.duanduan.view.DragRelativeLayout>
-
-    <com.kfzs.duanduan.view.DragRelativeLayout
-        android:id="@+id/view_rob_duty"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginBottom="@dimen/content_padding_20"
-        android:gravity="right"
-        android:layout_alignParentRight="true"
-        android:paddingBottom="@dimen/content_padding_10"
-        android:paddingTop="@dimen/content_padding_10"
-        android:visibility="visible">
-
-        <ImageView
-            android:id="@+id/iv_rob_duty"
-            android:layout_width="65dp"
-            android:layout_height="60dp"
-            android:adjustViewBounds="true"
-            android:scaleType="fitXY"
-            android:src="@mipmap/red_package_floatbtn" />
-    </com.kfzs.duanduan.view.DragRelativeLayout>
-
-    <TextView
-        android:id="@+id/test_change_user"
-        style="@style/style_button_small_yellow"
-        android:layout_width="wrap_content"
-        android:layout_height="30dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentStart="true"
-        android:layout_margin="@dimen/content_padding_10"
-        android:paddingEnd="@dimen/content_padding_10"
-        android:paddingStart="@dimen/content_padding_10"
-        android:text="切换账号"
-        android:visibility="gone" />
-
-    <TextView
-        android:id="@+id/test_change"
-        style="@style/style_button_small_yellow"
-        android:layout_width="wrap_content"
-        android:layout_height="30dp"
-        android:layout_above="@+id/test_change_user"
-        android:layout_alignParentStart="true"
-        android:layout_margin="@dimen/content_padding_10"
-        android:paddingEnd="@dimen/content_padding_10"
-        android:paddingStart="@dimen/content_padding_10"
-        android:text="切换服务器"
-        android:visibility="gone" />
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:layout_marginBottom="@dimen/content_padding_20"
+            android:layout_marginEnd="13dp"
+            android:gravity="right"
+            android:paddingBottom="@dimen/content_padding_10"
+            android:paddingTop="@dimen/content_padding_10"
+            android:visibility="visible">
+
+            <ImageView
+                android:id="@+id/iv_rob_duty"
+                android:layout_width="65dp"
+                android:layout_height="60dp"
+                android:adjustViewBounds="true"
+                android:scaleType="fitXY"
+                android:src="@mipmap/red_package_floatbtn" />
+        </com.kfzs.duanduan.view.DragRelativeLayout>
+
+        <TextView
+            android:id="@+id/test_change_user"
+            style="@style/style_button_small_yellow"
+            android:layout_width="wrap_content"
+            android:layout_height="30dp"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentStart="true"
+            android:layout_margin="@dimen/content_padding_10"
+            android:paddingEnd="@dimen/content_padding_10"
+            android:paddingStart="@dimen/content_padding_10"
+            android:text="切换账号"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/test_change"
+            style="@style/style_button_small_yellow"
+            android:layout_width="wrap_content"
+            android:layout_height="30dp"
+            android:layout_above="@+id/test_change_user"
+            android:layout_alignParentStart="true"
+            android:layout_margin="@dimen/content_padding_10"
+            android:paddingEnd="@dimen/content_padding_10"
+            android:paddingStart="@dimen/content_padding_10"
+            android:text="切换服务器"
+            android:visibility="gone" />
+    </RelativeLayout>
 </RelativeLayout>

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

@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="5dp"
         android:paddingTop="@dimen/content_padding_2"
-        android:src="@mipmap/homepage_item_jiangli" />
+        android:src="@mipmap/homepage_jianglilq" />
 
     <TextView
         android:id="@+id/homepage_item_get_award_name_tv"

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"/>
     </LinearLayout>
 
     <include layout="@layout/line_1px_hor" />

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>