diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 2b1236c..4db6cb4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -27,46 +27,50 @@ @Override protected void initData() { - List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); - if (dataBeans.size() == 0) { + if (StringHelper.getUserBean().getId() == null) { viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } + List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); + } else { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); + } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - adapter.notifyItemRemoved(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); - adapter.notifyItemChanged(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(adapter); + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); + } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 2b1236c..4db6cb4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -27,46 +27,50 @@ @Override protected void initData() { - List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); - if (dataBeans.size() == 0) { + if (StringHelper.getUserBean().getId() == null) { viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } + List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); + } else { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); + } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - adapter.notifyItemRemoved(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); - adapter.notifyItemChanged(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(adapter); + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); + } } } diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 1eea805..ff24db4 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -253,7 +253,7 @@ int itemSize = (realWidth - 4 * margins) / 3; LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.LEFT; + params.gravity = Gravity.START; viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); viewBinding.addVideoView.setLayoutParams(params); diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 2b1236c..4db6cb4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -27,46 +27,50 @@ @Override protected void initData() { - List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); - if (dataBeans.size() == 0) { + if (StringHelper.getUserBean().getId() == null) { viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } + List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); + } else { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); + } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - adapter.notifyItemRemoved(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); - adapter.notifyItemChanged(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(adapter); + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); + } } } diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 1eea805..ff24db4 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -253,7 +253,7 @@ int itemSize = (realWidth - 4 * margins) / 3; LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.LEFT; + params.gravity = Gravity.START; viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); viewBinding.addVideoView.setLayoutParams(params); diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 02cffff..a67fac2 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -9,11 +10,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -35,6 +38,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -69,6 +77,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -103,6 +116,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 2b1236c..4db6cb4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -27,46 +27,50 @@ @Override protected void initData() { - List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); - if (dataBeans.size() == 0) { + if (StringHelper.getUserBean().getId() == null) { viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } + List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); + } else { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); + } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - adapter.notifyItemRemoved(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); - adapter.notifyItemChanged(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(adapter); + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); + } } } diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 1eea805..ff24db4 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -253,7 +253,7 @@ int itemSize = (realWidth - 4 * margins) / 3; LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.LEFT; + params.gravity = Gravity.START; viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); viewBinding.addVideoView.setLayoutParams(params); diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 02cffff..a67fac2 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -9,11 +10,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -35,6 +38,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -69,6 +77,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -103,6 +116,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 4ba0bcd..8d07ec5 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -9,11 +10,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -35,6 +38,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -69,6 +77,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 2b1236c..4db6cb4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -27,46 +27,50 @@ @Override protected void initData() { - List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); - if (dataBeans.size() == 0) { + if (StringHelper.getUserBean().getId() == null) { viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } + List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); + } else { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); + } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - adapter.notifyItemRemoved(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); - adapter.notifyItemChanged(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(adapter); + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); + } } } diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 1eea805..ff24db4 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -253,7 +253,7 @@ int itemSize = (realWidth - 4 * margins) / 3; LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.LEFT; + params.gravity = Gravity.START; viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); viewBinding.addVideoView.setLayoutParams(params); diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 02cffff..a67fac2 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -9,11 +10,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -35,6 +38,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -69,6 +77,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -103,6 +116,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 4ba0bcd..8d07ec5 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -9,11 +10,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -35,6 +38,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -69,6 +77,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index d7b6aef..f5f4994 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -2,17 +2,20 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -38,6 +41,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -72,6 +80,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -106,6 +119,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -178,6 +196,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -211,6 +234,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -240,6 +268,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -274,6 +307,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 2b1236c..4db6cb4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -27,46 +27,50 @@ @Override protected void initData() { - List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); - if (dataBeans.size() == 0) { + if (StringHelper.getUserBean().getId() == null) { viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } + List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); + } else { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); + } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - adapter.notifyItemRemoved(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); - adapter.notifyItemChanged(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(adapter); + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); + } } } diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 1eea805..ff24db4 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -253,7 +253,7 @@ int itemSize = (realWidth - 4 * margins) / 3; LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.LEFT; + params.gravity = Gravity.START; viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); viewBinding.addVideoView.setLayoutParams(params); diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 02cffff..a67fac2 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -9,11 +10,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -35,6 +38,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -69,6 +77,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -103,6 +116,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 4ba0bcd..8d07ec5 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -9,11 +10,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -35,6 +38,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -69,6 +77,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index d7b6aef..f5f4994 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -2,17 +2,20 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -38,6 +41,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -72,6 +80,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -106,6 +119,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -178,6 +196,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -211,6 +234,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -240,6 +268,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -274,6 +307,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 6ace09f..e85bd61 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -18,11 +19,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -292,6 +295,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -331,6 +339,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -364,6 +377,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -393,6 +411,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 2b1236c..4db6cb4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -27,46 +27,50 @@ @Override protected void initData() { - List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); - if (dataBeans.size() == 0) { + if (StringHelper.getUserBean().getId() == null) { viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } + List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); + } else { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); + } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - adapter.notifyItemRemoved(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); - adapter.notifyItemChanged(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(adapter); + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); + } } } diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 1eea805..ff24db4 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -253,7 +253,7 @@ int itemSize = (realWidth - 4 * margins) / 3; LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.LEFT; + params.gravity = Gravity.START; viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); viewBinding.addVideoView.setLayoutParams(params); diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 02cffff..a67fac2 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -9,11 +10,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -35,6 +38,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -69,6 +77,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -103,6 +116,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 4ba0bcd..8d07ec5 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -9,11 +10,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -35,6 +38,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -69,6 +77,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index d7b6aef..f5f4994 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -2,17 +2,20 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -38,6 +41,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -72,6 +80,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -106,6 +119,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -178,6 +196,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -211,6 +234,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -240,6 +268,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -274,6 +307,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 6ace09f..e85bd61 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -18,11 +19,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -292,6 +295,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -331,6 +339,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -364,6 +377,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -393,6 +411,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index 5ad002d..d7cc435 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseLargeTypeBean; import com.casic.dcms.model.CaseProcessBean; import com.casic.dcms.model.CaseSmallTypeBean; @@ -12,11 +13,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -161,6 +164,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 2b1236c..4db6cb4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -27,46 +27,50 @@ @Override protected void initData() { - List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); - if (dataBeans.size() == 0) { + if (StringHelper.getUserBean().getId() == null) { viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } + List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); + } else { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); + } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - adapter.notifyItemRemoved(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); - adapter.notifyItemChanged(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(adapter); + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); + } } } diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 1eea805..ff24db4 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -253,7 +253,7 @@ int itemSize = (realWidth - 4 * margins) / 3; LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.LEFT; + params.gravity = Gravity.START; viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); viewBinding.addVideoView.setLayoutParams(params); diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 02cffff..a67fac2 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -9,11 +10,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -35,6 +38,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -69,6 +77,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -103,6 +116,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 4ba0bcd..8d07ec5 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -9,11 +10,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -35,6 +38,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -69,6 +77,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index d7b6aef..f5f4994 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -2,17 +2,20 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -38,6 +41,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -72,6 +80,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -106,6 +119,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -178,6 +196,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -211,6 +234,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -240,6 +268,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -274,6 +307,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 6ace09f..e85bd61 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -18,11 +19,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -292,6 +295,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -331,6 +339,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -364,6 +377,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -393,6 +411,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index 5ad002d..d7cc435 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseLargeTypeBean; import com.casic.dcms.model.CaseProcessBean; import com.casic.dcms.model.CaseSmallTypeBean; @@ -12,11 +13,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -161,6 +164,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index cba33fb..3ff0a07 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.model.CityBaseDataBean; @@ -15,11 +16,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -47,6 +50,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -81,6 +89,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -115,6 +128,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -149,6 +167,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -183,6 +206,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -217,6 +245,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -251,6 +284,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 2b1236c..4db6cb4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -27,46 +27,50 @@ @Override protected void initData() { - List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); - if (dataBeans.size() == 0) { + if (StringHelper.getUserBean().getId() == null) { viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } + List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); + } else { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); + } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - adapter.notifyItemRemoved(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); - adapter.notifyItemChanged(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(adapter); + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); + } } } diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 1eea805..ff24db4 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -253,7 +253,7 @@ int itemSize = (realWidth - 4 * margins) / 3; LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.LEFT; + params.gravity = Gravity.START; viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); viewBinding.addVideoView.setLayoutParams(params); diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 02cffff..a67fac2 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -9,11 +10,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -35,6 +38,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -69,6 +77,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -103,6 +116,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 4ba0bcd..8d07ec5 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -9,11 +10,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -35,6 +38,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -69,6 +77,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index d7b6aef..f5f4994 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -2,17 +2,20 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -38,6 +41,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -72,6 +80,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -106,6 +119,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -178,6 +196,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -211,6 +234,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -240,6 +268,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -274,6 +307,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 6ace09f..e85bd61 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -18,11 +19,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -292,6 +295,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -331,6 +339,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -364,6 +377,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -393,6 +411,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index 5ad002d..d7cc435 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseLargeTypeBean; import com.casic.dcms.model.CaseProcessBean; import com.casic.dcms.model.CaseSmallTypeBean; @@ -12,11 +13,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -161,6 +164,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index cba33fb..3ff0a07 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.model.CityBaseDataBean; @@ -15,11 +16,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -47,6 +50,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -81,6 +89,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -115,6 +128,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -149,6 +167,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -183,6 +206,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -217,6 +245,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -251,6 +284,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 5744d53..8a1df46 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LightListBean; import com.casic.dcms.model.LightMapBean; @@ -10,11 +11,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import java.util.List; import okhttp3.ResponseBody; @@ -70,6 +73,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 2b1236c..4db6cb4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -27,46 +27,50 @@ @Override protected void initData() { - List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); - if (dataBeans.size() == 0) { + if (StringHelper.getUserBean().getId() == null) { viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } + List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); + } else { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); + } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - adapter.notifyItemRemoved(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); - adapter.notifyItemChanged(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(adapter); + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); + } } } diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 1eea805..ff24db4 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -253,7 +253,7 @@ int itemSize = (realWidth - 4 * margins) / 3; LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.LEFT; + params.gravity = Gravity.START; viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); viewBinding.addVideoView.setLayoutParams(params); diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 02cffff..a67fac2 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -9,11 +10,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -35,6 +38,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -69,6 +77,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -103,6 +116,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 4ba0bcd..8d07ec5 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -9,11 +10,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -35,6 +38,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -69,6 +77,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index d7b6aef..f5f4994 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -2,17 +2,20 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -38,6 +41,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -72,6 +80,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -106,6 +119,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -178,6 +196,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -211,6 +234,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -240,6 +268,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -274,6 +307,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 6ace09f..e85bd61 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -18,11 +19,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -292,6 +295,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -331,6 +339,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -364,6 +377,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -393,6 +411,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index 5ad002d..d7cc435 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseLargeTypeBean; import com.casic.dcms.model.CaseProcessBean; import com.casic.dcms.model.CaseSmallTypeBean; @@ -12,11 +13,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -161,6 +164,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index cba33fb..3ff0a07 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.model.CityBaseDataBean; @@ -15,11 +16,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -47,6 +50,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -81,6 +89,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -115,6 +128,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -149,6 +167,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -183,6 +206,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -217,6 +245,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -251,6 +284,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 5744d53..8a1df46 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LightListBean; import com.casic.dcms.model.LightMapBean; @@ -10,11 +11,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import java.util.List; import okhttp3.ResponseBody; @@ -70,6 +73,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java index 4747237..6da4d81 100644 --- a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java @@ -2,17 +2,20 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -33,6 +36,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 2b1236c..4db6cb4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -27,46 +27,50 @@ @Override protected void initData() { - List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); - if (dataBeans.size() == 0) { + if (StringHelper.getUserBean().getId() == null) { viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } + List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); + } else { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); + } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - adapter.notifyItemRemoved(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); - adapter.notifyItemChanged(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(adapter); + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); + } } } diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 1eea805..ff24db4 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -253,7 +253,7 @@ int itemSize = (realWidth - 4 * margins) / 3; LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.LEFT; + params.gravity = Gravity.START; viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); viewBinding.addVideoView.setLayoutParams(params); diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 02cffff..a67fac2 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -9,11 +10,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -35,6 +38,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -69,6 +77,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -103,6 +116,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 4ba0bcd..8d07ec5 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -9,11 +10,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -35,6 +38,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -69,6 +77,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index d7b6aef..f5f4994 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -2,17 +2,20 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -38,6 +41,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -72,6 +80,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -106,6 +119,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -178,6 +196,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -211,6 +234,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -240,6 +268,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -274,6 +307,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 6ace09f..e85bd61 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -18,11 +19,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -292,6 +295,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -331,6 +339,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -364,6 +377,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -393,6 +411,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index 5ad002d..d7cc435 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseLargeTypeBean; import com.casic.dcms.model.CaseProcessBean; import com.casic.dcms.model.CaseSmallTypeBean; @@ -12,11 +13,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -161,6 +164,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index cba33fb..3ff0a07 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.model.CityBaseDataBean; @@ -15,11 +16,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -47,6 +50,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -81,6 +89,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -115,6 +128,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -149,6 +167,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -183,6 +206,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -217,6 +245,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -251,6 +284,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 5744d53..8a1df46 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LightListBean; import com.casic.dcms.model.LightMapBean; @@ -10,11 +11,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import java.util.List; import okhttp3.ResponseBody; @@ -70,6 +73,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java index 4747237..6da4d81 100644 --- a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java @@ -2,17 +2,20 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -33,6 +36,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java index ca2be61..5bbd924 100644 --- a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.CleanRecordBean; import com.casic.dcms.model.ToiletListModel; @@ -10,11 +11,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -67,6 +70,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -101,6 +109,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 2b1236c..4db6cb4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -27,46 +27,50 @@ @Override protected void initData() { - List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); - if (dataBeans.size() == 0) { + if (StringHelper.getUserBean().getId() == null) { viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } + List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); + } else { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); + } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - adapter.notifyItemRemoved(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); - adapter.notifyItemChanged(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(adapter); + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); + } } } diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 1eea805..ff24db4 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -253,7 +253,7 @@ int itemSize = (realWidth - 4 * margins) / 3; LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.LEFT; + params.gravity = Gravity.START; viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); viewBinding.addVideoView.setLayoutParams(params); diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 02cffff..a67fac2 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -9,11 +10,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -35,6 +38,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -69,6 +77,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -103,6 +116,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 4ba0bcd..8d07ec5 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -9,11 +10,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -35,6 +38,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -69,6 +77,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index d7b6aef..f5f4994 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -2,17 +2,20 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -38,6 +41,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -72,6 +80,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -106,6 +119,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -178,6 +196,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -211,6 +234,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -240,6 +268,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -274,6 +307,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 6ace09f..e85bd61 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -18,11 +19,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -292,6 +295,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -331,6 +339,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -364,6 +377,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -393,6 +411,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index 5ad002d..d7cc435 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseLargeTypeBean; import com.casic.dcms.model.CaseProcessBean; import com.casic.dcms.model.CaseSmallTypeBean; @@ -12,11 +13,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -161,6 +164,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index cba33fb..3ff0a07 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.model.CityBaseDataBean; @@ -15,11 +16,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -47,6 +50,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -81,6 +89,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -115,6 +128,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -149,6 +167,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -183,6 +206,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -217,6 +245,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -251,6 +284,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 5744d53..8a1df46 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LightListBean; import com.casic.dcms.model.LightMapBean; @@ -10,11 +11,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import java.util.List; import okhttp3.ResponseBody; @@ -70,6 +73,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java index 4747237..6da4d81 100644 --- a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java @@ -2,17 +2,20 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -33,6 +36,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java index ca2be61..5bbd924 100644 --- a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.CleanRecordBean; import com.casic.dcms.model.ToiletListModel; @@ -10,11 +11,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -67,6 +70,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -101,6 +109,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java b/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java index 62a27d3..9734377 100644 --- a/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java @@ -5,6 +5,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.ImageHelper; import com.casic.dcms.utils.StringHelper; @@ -13,12 +14,14 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.File; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -105,6 +108,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } }); } @@ -121,6 +129,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -155,6 +168,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 2b1236c..4db6cb4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -27,46 +27,50 @@ @Override protected void initData() { - List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); - if (dataBeans.size() == 0) { + if (StringHelper.getUserBean().getId() == null) { viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } + List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); + } else { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); + } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - adapter.notifyItemRemoved(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); - adapter.notifyItemChanged(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(adapter); + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); + } } } diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 1eea805..ff24db4 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -253,7 +253,7 @@ int itemSize = (realWidth - 4 * margins) / 3; LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.LEFT; + params.gravity = Gravity.START; viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); viewBinding.addVideoView.setLayoutParams(params); diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 02cffff..a67fac2 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -9,11 +10,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -35,6 +38,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -69,6 +77,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -103,6 +116,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 4ba0bcd..8d07ec5 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -9,11 +10,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -35,6 +38,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -69,6 +77,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index d7b6aef..f5f4994 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -2,17 +2,20 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -38,6 +41,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -72,6 +80,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -106,6 +119,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -178,6 +196,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -211,6 +234,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -240,6 +268,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -274,6 +307,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 6ace09f..e85bd61 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -18,11 +19,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -292,6 +295,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -331,6 +339,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -364,6 +377,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -393,6 +411,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index 5ad002d..d7cc435 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseLargeTypeBean; import com.casic.dcms.model.CaseProcessBean; import com.casic.dcms.model.CaseSmallTypeBean; @@ -12,11 +13,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -161,6 +164,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index cba33fb..3ff0a07 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.model.CityBaseDataBean; @@ -15,11 +16,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -47,6 +50,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -81,6 +89,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -115,6 +128,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -149,6 +167,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -183,6 +206,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -217,6 +245,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -251,6 +284,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 5744d53..8a1df46 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LightListBean; import com.casic.dcms.model.LightMapBean; @@ -10,11 +11,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import java.util.List; import okhttp3.ResponseBody; @@ -70,6 +73,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java index 4747237..6da4d81 100644 --- a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java @@ -2,17 +2,20 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -33,6 +36,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java index ca2be61..5bbd924 100644 --- a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.CleanRecordBean; import com.casic.dcms.model.ToiletListModel; @@ -10,11 +11,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -67,6 +70,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -101,6 +109,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java b/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java index 62a27d3..9734377 100644 --- a/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java @@ -5,6 +5,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.ImageHelper; import com.casic.dcms.utils.StringHelper; @@ -13,12 +14,14 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.File; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -105,6 +108,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } }); } @@ -121,6 +129,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -155,6 +168,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/UserViewModel.java b/app/src/main/java/com/casic/dcms/vm/UserViewModel.java index d5f920e..4f0ce91 100644 --- a/app/src/main/java/com/casic/dcms/vm/UserViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/UserViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LoginResultBean; import com.casic.dcms.model.UserBean; @@ -11,12 +12,14 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -78,6 +81,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -142,6 +150,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 2b1236c..4db6cb4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -27,46 +27,50 @@ @Override protected void initData() { - List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); - if (dataBeans.size() == 0) { + if (StringHelper.getUserBean().getId() == null) { viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } + List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); + } else { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); + } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - adapter.notifyItemRemoved(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); - adapter.notifyItemChanged(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(adapter); + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); + } } } diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 1eea805..ff24db4 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -253,7 +253,7 @@ int itemSize = (realWidth - 4 * margins) / 3; LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.LEFT; + params.gravity = Gravity.START; viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); viewBinding.addVideoView.setLayoutParams(params); diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 02cffff..a67fac2 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -9,11 +10,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -35,6 +38,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -69,6 +77,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -103,6 +116,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 4ba0bcd..8d07ec5 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -9,11 +10,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -35,6 +38,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -69,6 +77,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index d7b6aef..f5f4994 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -2,17 +2,20 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -38,6 +41,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -72,6 +80,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -106,6 +119,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -178,6 +196,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -211,6 +234,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -240,6 +268,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -274,6 +307,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 6ace09f..e85bd61 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -18,11 +19,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -292,6 +295,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -331,6 +339,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -364,6 +377,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -393,6 +411,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index 5ad002d..d7cc435 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseLargeTypeBean; import com.casic.dcms.model.CaseProcessBean; import com.casic.dcms.model.CaseSmallTypeBean; @@ -12,11 +13,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -161,6 +164,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index cba33fb..3ff0a07 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.model.CityBaseDataBean; @@ -15,11 +16,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -47,6 +50,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -81,6 +89,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -115,6 +128,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -149,6 +167,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -183,6 +206,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -217,6 +245,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -251,6 +284,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 5744d53..8a1df46 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LightListBean; import com.casic.dcms.model.LightMapBean; @@ -10,11 +11,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import java.util.List; import okhttp3.ResponseBody; @@ -70,6 +73,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java index 4747237..6da4d81 100644 --- a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java @@ -2,17 +2,20 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -33,6 +36,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java index ca2be61..5bbd924 100644 --- a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.CleanRecordBean; import com.casic.dcms.model.ToiletListModel; @@ -10,11 +11,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -67,6 +70,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -101,6 +109,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java b/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java index 62a27d3..9734377 100644 --- a/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java @@ -5,6 +5,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.ImageHelper; import com.casic.dcms.utils.StringHelper; @@ -13,12 +14,14 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.File; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -105,6 +108,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } }); } @@ -121,6 +129,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -155,6 +168,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/UserViewModel.java b/app/src/main/java/com/casic/dcms/vm/UserViewModel.java index d5f920e..4f0ce91 100644 --- a/app/src/main/java/com/casic/dcms/vm/UserViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/UserViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LoginResultBean; import com.casic.dcms.model.UserBean; @@ -11,12 +12,14 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -78,6 +81,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -142,6 +150,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/VersionViewModel.java b/app/src/main/java/com/casic/dcms/vm/VersionViewModel.java index d453411..12f5ead 100644 --- a/app/src/main/java/com/casic/dcms/vm/VersionViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/VersionViewModel.java @@ -2,17 +2,20 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.NewVersionBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -33,6 +36,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 2b1236c..4db6cb4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -27,46 +27,50 @@ @Override protected void initData() { - List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); - if (dataBeans.size() == 0) { + if (StringHelper.getUserBean().getId() == null) { viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } + List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); + } else { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); + } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - adapter.notifyItemRemoved(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); - adapter.notifyItemChanged(position); - adapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(adapter); + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); + } } } diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 1eea805..ff24db4 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -253,7 +253,7 @@ int itemSize = (realWidth - 4 * margins) / 3; LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.LEFT; + params.gravity = Gravity.START; viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); viewBinding.addVideoView.setLayoutParams(params); diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 02cffff..a67fac2 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -9,11 +10,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -35,6 +38,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -69,6 +77,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -103,6 +116,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 4ba0bcd..8d07ec5 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -9,11 +10,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -35,6 +38,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -69,6 +77,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index d7b6aef..f5f4994 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -2,17 +2,20 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -38,6 +41,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -72,6 +80,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -106,6 +119,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -178,6 +196,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -211,6 +234,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -240,6 +268,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -274,6 +307,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 6ace09f..e85bd61 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -18,11 +19,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -292,6 +295,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -331,6 +339,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -364,6 +377,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -393,6 +411,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index 5ad002d..d7cc435 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseLargeTypeBean; import com.casic.dcms.model.CaseProcessBean; import com.casic.dcms.model.CaseSmallTypeBean; @@ -12,11 +13,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -161,6 +164,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index cba33fb..3ff0a07 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.model.CityBaseDataBean; @@ -15,11 +16,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -47,6 +50,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -81,6 +89,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -115,6 +128,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -149,6 +167,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -183,6 +206,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -217,6 +245,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -251,6 +284,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 5744d53..8a1df46 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LightListBean; import com.casic.dcms.model.LightMapBean; @@ -10,11 +11,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import java.util.List; import okhttp3.ResponseBody; @@ -70,6 +73,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java index 4747237..6da4d81 100644 --- a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java @@ -2,17 +2,20 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -33,6 +36,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java index ca2be61..5bbd924 100644 --- a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.CleanRecordBean; import com.casic.dcms.model.ToiletListModel; @@ -10,11 +11,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -67,6 +70,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -101,6 +109,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java b/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java index 62a27d3..9734377 100644 --- a/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java @@ -5,6 +5,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.ImageHelper; import com.casic.dcms.utils.StringHelper; @@ -13,12 +14,14 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.File; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -105,6 +108,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } }); } @@ -121,6 +129,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -155,6 +168,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/UserViewModel.java b/app/src/main/java/com/casic/dcms/vm/UserViewModel.java index d5f920e..4f0ce91 100644 --- a/app/src/main/java/com/casic/dcms/vm/UserViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/UserViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LoginResultBean; import com.casic.dcms.model.UserBean; @@ -11,12 +12,14 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -78,6 +81,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -142,6 +150,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/VersionViewModel.java b/app/src/main/java/com/casic/dcms/vm/VersionViewModel.java index d453411..12f5ead 100644 --- a/app/src/main/java/com/casic/dcms/vm/VersionViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/VersionViewModel.java @@ -2,17 +2,20 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.NewVersionBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -33,6 +36,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/vm/WellViewModel.java b/app/src/main/java/com/casic/dcms/vm/WellViewModel.java index 7bef8be..99acf42 100644 --- a/app/src/main/java/com/casic/dcms/vm/WellViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/WellViewModel.java @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.WellDetailBean; import com.casic.dcms.model.WellListBean; @@ -10,11 +11,13 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.vm.BaseViewModel; import com.pengxh.androidx.lite.vm.LoadState; import com.pengxh.androidx.lite.vm.ObserverSubscriber; import java.io.IOException; +import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -67,6 +70,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -101,6 +109,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override @@ -135,6 +148,11 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); + if (e instanceof ConnectException) { + StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); + } else { + StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); + } } @Override