公告开始

app/src/main/AndroidManifest.xml

@@ -52,6 +52,13 @@
 
 
         </activity>
+
+        <activity
+            android:name=".ui.announcement.AnnouncementActivity"
+            android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme"
+            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
     </application>
 
 </manifest>
\ No newline at end of file

app/src/main/java/com/xingdata/zzdpos/ui/announcement/AnnouncementActivity.java

+package com.xingdata.zzdpos.ui.announcement;
+
+
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseActivity;
+import com.xingdata.zzdpos.databinding.ActivityAnnouncementBinding;
+import com.xingdata.zzdpos.ui.announcement.fragment.AnnouncementFragment;
+
+
+public class AnnouncementActivity extends BaseActivity<AnnouncementPresenter, ActivityAnnouncementBinding> implements AnnouncementContract.View {
+
+    private AnnouncementFragment mAnnouncementFragment = new AnnouncementFragment();
+
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_announcement;
+
+    }
+
+    @Override
+    public void initView() {
+//        mViewBinding.imgBack.setOnClickListener(view -> {
+//            finish();
+//        });
+//        loadRootFragment(R.id.f_right, mAnnouncementDetailFragment, false, false);
+//        loadRootFragment(R.id.f_left, mAnnouncementTitleFragment, false, false);
+
+
+    }
+//
+//
+//    @Override
+//    public void showAnnouncementDetail(Notice s) {
+//        mAnnouncementDetailFragment.showAnnouncementDetail(s);
+//    }
+//
+//    @Override
+//    public void loadNotice(Pager<Notice> noticePager, boolean isRefresh) {
+//        mAnnouncementTitleFragment.setData(noticePager, isRefresh);
+//    }
+}

app/src/main/java/com/xingdata/zzdpos/ui/announcement/AnnouncementContract.java

+package com.xingdata.zzdpos.ui.announcement;
+
+
+import com.xingdata.zzdpos.base.BasePresenter;
+import com.xingdata.zzdpos.base.BaseView;
+
+public interface AnnouncementContract {
+
+    interface View extends BaseView {
+
+//
+//        /**
+//         * 显示公告内容
+//         */
+//        void showAnnouncementDetail(Notice s);
+//        /**
+//         * 加载列表
+//         */
+//        void loadNotice(Pager<Notice> noticePager, boolean isRefresh);
+    }
+
+
+    abstract class Presenter extends BasePresenter<View> {
+
+
+//        /**
+//         * 初始化查询公告列表
+//         *
+//         */
+//        abstract void queryNoticeList();
+//
+//        /**
+//         * 点击公告标题
+//         */
+//        abstract void clickTitleItem(Notice notice);
+    }
+}

app/src/main/java/com/xingdata/zzdpos/ui/announcement/AnnouncementPresenter.java

+package com.xingdata.zzdpos.ui.announcement;
+
+
+public class AnnouncementPresenter extends AnnouncementContract.Presenter {
+    private int nowPageNumber = 1;
+    private int nowPageSize = 10;
+
+    @Override
+    public void onAttached() {
+    }
+//
+//    @Override
+//    public void queryNoticeList() {
+//        ApiFactory.Notice.queryNotice(nowPageNumber, nowPageSize).doFinally(() -> {
+////            mView.isShowLoading(false);
+//        })
+//                .subscribe(noticePager -> {
+//                    if (noticePager.getTotalRow() == 0) {
+//                        ToastUtils.showShort("抱歉，暂无公告");
+//                    }
+//                    //判断是否能加载更多
+//                    mView.loadNotice(noticePager, nowPageNumber == 1);
+//                }, throwable -> {
+//                    ToastUtils.showShort(throwable.getMessage());
+//                });
+//    }
+//
+//    @Override
+//    public void clickTitleItem(Notice s) {
+//        mView.showAnnouncementDetail(s);
+//    }
+//}
+}
\ No newline at end of file

app/src/main/java/com/xingdata/zzdpos/ui/announcement/adapter/AnnouncementAdapter.java

+//package com.xingdata.zzdpos.ui.announcement.adapter;
+//
+//
+//import android.support.annotation.Nullable;
+//import android.view.View;
+//import android.view.ViewGroup;
+//
+//import com.blankj.utilcode.util.TimeUtils;
+//import com.xingdata.zzdhd.R;
+//import com.xingdata.zzdhd.base.BaseAdapter;
+//import com.xingdata.zzdhd.base.BaseViewHolder;
+//import com.xingdata.zzdhd.databinding.ItemAnnouncementBinding;
+//import com.xingdata.zzdhd.model.Notice;
+//
+//import java.util.List;
+//
+//public class AnnouncementAdapter extends BaseAdapter<Notice, ItemAnnouncementBinding> {
+//    public Integer isClickPos =0;
+//
+//    public AnnouncementAdapter(@Nullable List<Notice> data) {
+//        super(R.layout.item_announcement, data);
+//
+//    }
+//
+//    @Override
+//    protected void convert(BaseViewHolder helper, Notice item) {
+//        if (helper.getAdapterPosition()==isClickPos){
+//            helper.getConvertView().findViewById(R.id.line_is_clicked).setVisibility(View.VISIBLE);
+//        }
+//
+//        super.convert(helper, item);
+//    }
+//
+//    @Override
+//    protected void convert(ItemAnnouncementBinding mViewBinding, Notice item) {
+//           mViewBinding.tvTitle.setText(item.getNoticeTitle());
+//           mViewBinding.tvDate.setText(TimeUtils.millis2String(item.getCreateTime()));
+//    }
+//
+//
+//    @Override
+//    protected View getItemView(int layoutResId, ViewGroup parent) {
+//        return super.getItemView(layoutResId, parent);
+//    }
+//
+//
+//}

app/src/main/java/com/xingdata/zzdpos/ui/announcement/fragment/AnnouncementFragment.java

+package com.xingdata.zzdpos.ui.announcement.fragment;
+
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseFragment;
+import com.xingdata.zzdpos.databinding.FragmentAnnouncementBinding;
+import com.xingdata.zzdpos.ui.announcement.AnnouncementPresenter;
+
+
+public class AnnouncementFragment extends BaseFragment<AnnouncementPresenter, FragmentAnnouncementBinding> {
+//    private AnnouncementAdapter announcementAdapter;
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.fragment_announcement;
+    }
+
+    @Override
+    protected boolean isLazy() {
+        return false;
+    }
+
+    @Override
+    public void initView() {
+//
+//        initRecycler();
+//        mPresenter.queryNoticeList();
+    }
+
+
+//    private void initRecycler() {
+//        mViewBinding.announcementRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
+//        announcementAdapter = new AnnouncementAdapter(new ArrayList<>());
+//        announcementAdapter.bindToRecyclerView(mViewBinding.announcementRecycler);
+//        announcementAdapter.setOnItemClickListener((adapter, view, position) -> {
+//            if (announcementAdapter.isClickPos != null) {
+//                adapter.getViewByPosition(mViewBinding.announcementRecycler, announcementAdapter.isClickPos, R.id.line_is_clicked).setVisibility(View.INVISIBLE);
+//            }
+//            view.findViewById(R.id.line_is_clicked).setVisibility(View.VISIBLE);
+//            announcementAdapter.isClickPos = position;
+//            clickItem(announcementAdapter.getData().get(position));
+//        });
+//
+//
+//    }
+//
+//
+//    private void clickItem(Notice s) {
+//        mPresenter.clickTitleItem(s);
+//    }
+//
+//
+//    /**
+//     * 设置数据
+//     *
+//     * @param pager     数据
+//     * @param isRefresh 是否刷新
+//     */
+//    public void setData(Pager<Notice> pager, boolean isRefresh) {
+//        if (isRefresh) {
+//            announcementAdapter.setEnableLoadMore(true);
+//            mViewBinding.srlProduct.setRefreshing(false);
+//        }
+//        if (isRefresh) announcementAdapter.setNewData(pager.getList());
+//        else if (pager.getList().size() > 0) announcementAdapter.addData(pager.getList());
+//        if (pager.isLastPage()) announcementAdapter.loadMoreEnd(isRefresh);
+//        else announcementAdapter.loadMoreComplete();
+//
+//        //获取第一条的公告
+//        if (announcementAdapter.getData() != null) {
+//            clickItem(announcementAdapter.getData().get(0));
+//        }
+//    }
+//
+
+}

app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/MyselfFragment.java

@@ -4,12 +4,14 @@ package com.xingdata.zzdpos.ui.main.fragment;
 import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
 
+import com.blankj.utilcode.util.ActivityUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentMyselfBinding;
+import com.xingdata.zzdpos.ui.announcement.AnnouncementActivity;
 import com.xingdata.zzdpos.ui.main.MainPresenter;
 
 import com.xingdata.zzdpos.ui.main.adapter.MySelfRecyclerAdapter;
@@ -45,7 +47,7 @@ public class MyselfFragment extends BaseFragment<MainPresenter, FragmentMyselfBi
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 switch ((int) adapter.getData().get(position)) {
                     case C.MENU.MENU_ANNOUNCEMENT://公告
-
+                        ActivityUtils.startActivity(getActivity(), AnnouncementActivity.class);
                         break;
                     case C.MENU.MENU_FEED://反馈
 

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+
+    </FrameLayout>
+
+</layout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+
+    <android.support.constraint.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white">
+
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:gravity="center"
+            android:text="@string/announcement_meun"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <android.support.v4.widget.SwipeRefreshLayout
+            android:id="@+id/srl_product"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginTop="@dimen/all_margin"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_title">
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/announcement_recycler"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </android.support.v4.widget.SwipeRefreshLayout>
+
+
+    </android.support.constraint.ConstraintLayout>
+
+
+</layout>
\ No newline at end of file

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

@@ -60,7 +60,7 @@
                         android:layout_height="wrap_content"
                         android:text="李小乐"
                         android:textColor="@color/white_caocao"
-                        android:textSize="@dimen/all_text_size" />
+                        android:textSize="@dimen/big_text_size" />
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -68,7 +68,7 @@
                         android:layout_marginStart="@dimen/all_padding"
                         android:text="18710251009"
                         android:textColor="@color/white_caocao"
-                        android:textSize="@dimen/all_text_size_small" />
+                        android:textSize="@dimen/small_text_size" />
                 </LinearLayout>
 
                 <LinearLayout
@@ -83,7 +83,7 @@
                         android:layout_height="wrap_content"
                         android:text="北京市丰台区南四环西路186号"
                         android:textColor="@color/white_caocao"
-                        android:textSize="@dimen/all_text_size_small" />
+                        android:textSize="@dimen/small_text_size" />
 
                     <ImageView
                         android:layout_width="wrap_content"

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

@@ -16,7 +16,7 @@
     <dimen name="all_text_size_super_big">25sp</dimen>
     <dimen name="all_margin_left">15dp</dimen>
     <dimen name="title_height">50dp</dimen>
-    <dimen name="small_text_size">13sp</dimen>
+    <dimen name="small_text_size">14sp</dimen>
     <dimen name="big_text_size">18sp</dimen>
     <dimen name="sbig_text_size">25sp</dimen>
     <integer name="all_top_weight">2</integer>