diff --git a/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java index 6718736..d8e92a0 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java @@ -46,6 +46,7 @@ import com.otaliastudios.cameraview.PictureResult; import com.otaliastudios.cameraview.VideoResult; import com.otaliastudios.cameraview.controls.Mode; +import com.otaliastudios.cameraview.size.Size; import com.tencent.map.geolocation.TencentLocation; import com.tencent.tencentmap.mapsdk.maps.CameraUpdate; import com.tencent.tencentmap.mapsdk.maps.CameraUpdateFactory; @@ -78,6 +79,7 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; +import java.util.Collection; import java.util.Date; import java.util.List; import java.util.Objects; @@ -261,6 +263,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene // SizeSelector maxWidthSizeSelector = SizeSelectors.maxWidth(size.getWidth()); // SizeSelector maxHeightSizeSelector = SizeSelectors.maxHeight(size.getHeight()); // camera.setVideoSize(SizeSelectors.and(maxHeightSizeSelector, maxWidthSizeSelector)); + Collection supportedPictureSizes = options.getSupportedPictureSizes(); camera.setVideoBitRate(2000000); } diff --git a/app/src/main/java/com/navinfo/outdoor/api/Constant.java b/app/src/main/java/com/navinfo/outdoor/api/Constant.java index 47ada11..a68d867 100644 --- a/app/src/main/java/com/navinfo/outdoor/api/Constant.java +++ b/app/src/main/java/com/navinfo/outdoor/api/Constant.java @@ -100,6 +100,7 @@ public class Constant { public static String FILE_PATH = null;//银行卡图片途径 + //message word 值 public static final int TREASURE_FRAGMENT = 100;//抽屉界面的展示和隐藏 public static final int TREASURE_WORD = 39;//poi 对地图页面marker 的一个展示 编辑 diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java index f6fcbe9..227cea0 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java @@ -1,5 +1,6 @@ package com.navinfo.outdoor.fragment; +import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.ActivityInfo; @@ -138,6 +139,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen } if (msg.what == 0x101) { initMessageNotice(); + Log.d("TAGss", "handleMessagesssss: "+msg); } return false; } @@ -160,7 +162,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen private ArrayList latList; private ArrayList poiEntityArrayList; private ImageView ivMassNotification; - private int messageType = 0; + private int messageType = 0;//0: 已读消息 1:新消息 public static TreasureFragment newInstance(Bundle bundle) { @@ -193,11 +195,11 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen } private void initMessageNotice() { - + HttpParams httpParams = new HttpParams("type", messageType + ""); OkGoBuilder.getInstance() .Builder(getActivity()) .url(HttpInterface.MESSAGE_INFO_PUSH) - .params(new HttpParams("type", messageType + "")) + .params(httpParams) .cls(MessageNoticeBean.class) .token(Constant.ACCESS_TOKEN) .getRequest(new Callback() { @@ -205,11 +207,17 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen public void onSuccess(MessageNoticeBean messageNoticeBean, int id) { dismissLoadingDialog(); if (messageNoticeBean.getCode() == 200) { - if (messageType == 0) { - ivMassNotification.setVisibility(View.GONE); - } else if (messageType == 1) { + List noticeBeanBody = messageNoticeBean.getBody(); + if (noticeBeanBody != null) { ivMassNotification.setVisibility(View.VISIBLE); + messageType = 1; + } else { + ivMassNotification.setVisibility(View.GONE); + messageType = 0; } + SharedPreferences.Editor spMessageType = getActivity().getSharedPreferences("messageType", getActivity().MODE_PRIVATE).edit(); + spMessageType.putInt("messageType", messageType); + spMessageType.commit(); } else { Toast.makeText(getActivity(), messageNoticeBean.getMessage() + "", Toast.LENGTH_SHORT).show(); } @@ -228,6 +236,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen super.initView(); EventBus.getDefault().register(this); //fragment 管理器 + supportFragmentManager = Objects.requireNonNull(getActivity()).getSupportFragmentManager(); PoiDatabase poiDatabase = PoiDatabase.getInstance(getContext()); poiDao = poiDatabase.getPoiDao(); @@ -333,7 +342,17 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen treasureMap.getLayoutParams().height = widthHeight[1]; //消息通知: - handler.sendEmptyMessageDelayed(0x101,10000); + SharedPreferences messageTypeSp = getActivity().getSharedPreferences("messageType", Context.MODE_PRIVATE); + int messageTypeSpInt = messageTypeSp.getInt("messageType", 0); + if (ivMessage .isClickable()){ + ivMassNotification.setVisibility(View.GONE); + messageType = 0; + }else { + ivMassNotification.setVisibility(View.VISIBLE); + messageType =1; + } + handler.sendEmptyMessageDelayed(0x101, 5000); + Log.d("TAG", "initViewsssssss: "+handler); } diff --git a/app/src/main/res/layout/activity_pictures.xml b/app/src/main/res/layout/activity_pictures.xml index 04528bb..c42032f 100644 --- a/app/src/main/res/layout/activity_pictures.xml +++ b/app/src/main/res/layout/activity_pictures.xml @@ -16,12 +16,12 @@ android:id="@+id/camera" android:layout_width="match_parent" android:layout_height="match_parent" - app:cameraPictureSizeMaxArea="921600" - app:cameraPictureSizeMinArea="518400" - app:cameraPictureSizeMaxWidth="960" - app:cameraPictureSizeMinHeight="720" - app:cameraPictureSizeMinWidth="720" - app:cameraPictureSizeMaxHeight="960" + app:cameraPictureSizeMaxArea="3200000" + app:cameraPictureSizeMaxHeight="2000" + app:cameraPictureSizeMinHeight="1000" + app:cameraPictureSizeMaxWidth="2000" + app:cameraPictureSizeMinWidth="1000" + app:cameraPictureSizeAspectRatio="1280:720" android:keepScreenOn="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toTopOf="parent" />