From e18ab61af1e4508ac05f11603a5f944cf9a9fc67 Mon Sep 17 00:00:00 2001 From: 陶汉栋 <2821744554@qq.com> Date: Mon, 26 Mar 2018 17:52:42 +0800 Subject: [PATCH] no message --- app/build.gradle | 2 +- app/src/main/AndroidManifest.xml | 33 ++++++++++++++------------------- app/src/main/java/com/shunzhi/parent/bean/message/MyMessage.java | 13 +++++++++++++ app/src/main/java/com/shunzhi/parent/bean/message/PHMessageSession.java | 3 --- app/src/main/java/com/shunzhi/parent/manager/MessageManager.java | 3 ++- app/src/main/java/com/shunzhi/parent/ui/activity/message/MesageActivity.java | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java | 18 ++++++++++-------- app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java | 16 ++++++++++++++-- app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java | 2 -- app/src/main/res/layout/activity_mesage.xml | 43 +++++++++++++++++++++++++++++++++++++++++++ app/src/main/res/layout/activity_personinfo.xml | 9 +++++---- app/src/main/res/layout/fragment_mine.xml | 8 +++++--- app/src/main/res/layout/item_message.xml | 34 ++++++++++++++++++++++++++++++++++ mvpsdk/src/main/java/com/share/mvpsdk/global/GlobalApplication.java | 7 ++++++- 14 files changed, 268 insertions(+), 44 deletions(-) create mode 100644 app/src/main/java/com/shunzhi/parent/bean/message/MyMessage.java create mode 100644 app/src/main/java/com/shunzhi/parent/ui/activity/message/MesageActivity.java create mode 100644 app/src/main/res/layout/activity_mesage.xml create mode 100644 app/src/main/res/layout/item_message.xml diff --git a/app/build.gradle b/app/build.gradle index 4be4291..a49cac9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,7 +32,7 @@ android { productFlavors { } } -greendao{ +greendao { schemaVersion 1//数据库版本升级 } dependencies { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0ed9333..9b2e63d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,9 +67,9 @@ - - - + + + - - - - + + + + @@ -141,15 +141,13 @@ - - + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> - - + android:screenOrientation="portrait" /> - + android:screenOrientation="portrait" /> - - + android:exported="false"> + + \ No newline at end of file diff --git a/app/src/main/java/com/shunzhi/parent/bean/message/MyMessage.java b/app/src/main/java/com/shunzhi/parent/bean/message/MyMessage.java new file mode 100644 index 0000000..a19604c --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/bean/message/MyMessage.java @@ -0,0 +1,13 @@ +package com.shunzhi.parent.bean.message; + +import org.greenrobot.greendao.annotation.Entity; + +/** + * Created by ToaHanDong on 2018/3/26. + */ + +@Entity(nameInDb = "mymessage") +public class MyMessage { + + +} diff --git a/app/src/main/java/com/shunzhi/parent/bean/message/PHMessageSession.java b/app/src/main/java/com/shunzhi/parent/bean/message/PHMessageSession.java index 4438cff..56b73b2 100644 --- a/app/src/main/java/com/shunzhi/parent/bean/message/PHMessageSession.java +++ b/app/src/main/java/com/shunzhi/parent/bean/message/PHMessageSession.java @@ -2,12 +2,9 @@ package com.shunzhi.parent.bean.message; import com.shunzhi.parent.AppConfig; import com.shunzhi.parent.AppContext; - import org.greenrobot.greendao.annotation.Entity; import org.greenrobot.greendao.annotation.Id; - import java.util.Date; - import org.greenrobot.greendao.annotation.Generated; import org.greenrobot.greendao.annotation.Keep; diff --git a/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java b/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java index c949f74..526abfa 100644 --- a/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java +++ b/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java @@ -101,12 +101,13 @@ public class MessageManager { JSONObject json = new JSONObject(customNotification.getContent()); String type = json.optString("type"); String uuid = json.optString("msgId"); + Timber.d("onCustomNotificationReceive%s","json="+json.toString()); if ("homework".equals(type)) { PHMessageSession session = PHMessageSession.findAndCreateSession(PHMessageSession.sessionType_homework, true); session.setSessionName("作业通知"); session.setDate(new Date(customNotification.getTime())); session.setSessionText(json.optString("title")); - ToastUtils.showToast(json.optString("title")+"uuid="+uuid); +// ToastUtils.showToast(json.optString("title")+"uuid="+uuid); PHMessage message = new PHMessage(); PHMessageDao messageDao = AppContext.getInstance().getDaoSession().getPHMessageDao(); diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/message/MesageActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/message/MesageActivity.java new file mode 100644 index 0000000..f1e6a15 --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/message/MesageActivity.java @@ -0,0 +1,121 @@ +package com.shunzhi.parent.ui.activity.message; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.support.v7.widget.LinearLayoutManager; +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.share.mvpsdk.base.activity.BaseCompatActivity; +import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter; +import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder; +import com.share.mvpsdk.utils.DateUtils; +import com.shunzhi.parent.R; +import com.shunzhi.parent.bean.message.PHMessage; +import com.shunzhi.parent.bean.message.PHMessageSession; + +import java.util.ArrayList; +import java.util.List; + +public class MesageActivity extends BaseCompatActivity implements View.OnClickListener { + + RecyclerView recyclerView; + + ImageView iv_back; + + MEssageAdapter mEssageAdapter=null; + + List phMessages=new ArrayList<>(); + + @Override + protected void initView(Bundle savedInstanceState) { + + initViews(); + + } + + private void initViews() { + + recyclerView = findViewById(R.id.recyclerView); + iv_back = findViewById(R.id.iv_back); + + iv_back.setOnClickListener(this); + + initAdapter(); + } + + private void initAdapter() { + + if (null==mEssageAdapter)mEssageAdapter=new MEssageAdapter(); + if (null==recyclerView.getAdapter())recyclerView.setAdapter(mEssageAdapter); + mEssageAdapter.addAll(phMessages); + recyclerView.setAdapter(mEssageAdapter); + + } + + @Override + protected int getLayoutId() { + return R.layout.activity_mesage; + } + + @Override + public void onClick(View view) { + switch (view.getId()) { + case R.id.iv_back: + finish(); + break; + } + } + + + private class MEssageAdapter extends BaseRecyclerViewAdapter { + + @Override + public void onAttachedToRecyclerView(RecyclerView recyclerView) { + super.onAttachedToRecyclerView(recyclerView); + LinearLayoutManager layoutManager = new LinearLayoutManager(MesageActivity.this); + layoutManager.setOrientation(LinearLayoutManager.VERTICAL); + recyclerView.setLayoutManager(layoutManager); + } + + @Override + public BaseRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + + View view = LayoutInflater.from(MesageActivity.this).inflate(R.layout.item_message, parent, false); + MessageViewHolder messageViewHolder = new MessageViewHolder(view); + + return messageViewHolder; + } + + private class MessageViewHolder extends BaseRecyclerViewHolder { + + TextView tvMessageContent, tvDate; + List dateString = new ArrayList<>(); + + public MessageViewHolder(View itemView) { + super(itemView); + tvMessageContent = itemView.findViewById(R.id.tvMessageContent); + tvDate = itemView.findViewById(R.id.tvDate); + } + + @Override + public void onBindViewHolder(PHMessage object, int position) { + tvMessageContent.setText(object.getMessageText()); + String date = DateUtils.date2str(object.getDate(), "yyyyMMDD"); + if (!dateString.contains(date)) { + dateString.add(date); + tvDate.setText(date); + tvDate.setVisibility(View.VISIBLE); + }else { + tvDate.setVisibility(View.GONE); + } + + } + } + } + +} diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java index 48edc3b..f97756f 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java @@ -15,6 +15,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import com.bumptech.glide.Glide; import com.jcodecraeer.xrecyclerview.XRecyclerView; import com.share.mvpsdk.base.BasePresenter; import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment; @@ -111,7 +112,6 @@ public class ConsultFragment extends BaseMVPCompatFragment implements MineContract.IMineView, View.OnClickListener { - LinearLayout childlayout, personinfo, layout_orderDetail, layout_order, layout_cache, layout_about, layout_feedback, top_layout, layout_afterLogin; + LinearLayout childlayout, personinfo, layout_orderDetail, layout_order, layout_cache, layout_about, layout_feedback, top_layout, layout_afterLogin + ,layout_message; RoundedImageView user_photo; - TextView user_name, user_mobile, tvExit, binding_state; + TextView user_name, user_mobile, tvExit, binding_state,tvMessageCount; @NonNull @Override @@ -59,6 +64,9 @@ public class MineFragment extends BaseMVPCompatFragment(); describeList = new ArrayList<>(); -// Log.d("66666","isQidong="+isQidong); if (isQidong) { AppConfig.getAppConfig(getContext()).set(AppConfig.APP_IS_START, "1"); String fileUrl = "", describe = ""; @@ -150,7 +149,6 @@ public class StartFragment extends BaseMVPCompatFragment + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_personinfo.xml b/app/src/main/res/layout/activity_personinfo.xml index 7a4b94f..16f3fb8 100644 --- a/app/src/main/res/layout/activity_personinfo.xml +++ b/app/src/main/res/layout/activity_personinfo.xml @@ -19,19 +19,20 @@ + android:layout_height="400dp"> + > @@ -118,6 +119,7 @@ android:textSize="@dimen/txtsize_title" /> + + + + + + + \ No newline at end of file diff --git a/mvpsdk/src/main/java/com/share/mvpsdk/global/GlobalApplication.java b/mvpsdk/src/main/java/com/share/mvpsdk/global/GlobalApplication.java index 5e4b301..219d03b 100644 --- a/mvpsdk/src/main/java/com/share/mvpsdk/global/GlobalApplication.java +++ b/mvpsdk/src/main/java/com/share/mvpsdk/global/GlobalApplication.java @@ -6,7 +6,9 @@ import android.os.Handler; import com.orhanobut.logger.LogLevel; import com.orhanobut.logger.Logger; +import com.share.mvpsdk.utils.ToastUtils; +import timber.log.BuildConfig; import timber.log.Timber; @@ -34,8 +36,11 @@ public class GlobalApplication extends Application { handler = new Handler(); mainThreadId = android.os.Process.myTid(); mApp=this; + if (!BuildConfig.DEBUG) { + Timber.plant(new Timber.DebugTree()); + } //LogLevel.FULL : LogLevel.NONE - Logger.init(LOG_TAG).logLevel(LogLevel.FULL); +// Logger.init(LOG_TAG).logLevel(LogLevel.FULL); } /** -- libgit2 0.21.0