1.修改报名页面相关逻辑

杨帅
1 parent 13c34975
Showing 6 changed files with 143 additions and 37 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/presenter/CollRunningMapFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/service/CollStepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningMapFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/Constant.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/StepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RegistrationInfoFragment.java
@@ -46,6 +46,7 @@ import com.baidu.trace.model.StatusCodes;
 import com.baidu.trace.model.TraceLocation;
 import com.baidu.trace.model.TransportMode;
 import com.cnlive.moudle.collectionTrace.frame.view.CollRunningMapFragmentView;
+import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.service.StepService;
 import com.cnlive.moudle.pedometer.utils.CommonUtil;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
@@ -68,8 +69,6 @@ public class CollRunningMapFragmentPresenter extends MvpBasePresenter&lt;CollRunnin
     private int realTimePageSize = 1000;
     //分页索引
     private int realTimePageIndex = 1;
-    //查询标识
-    private int tag = 1;
     /**
      * 历史轨迹请求
      */
@@ -115,7 +114,7 @@ public class CollRunningMapFragmentPresenter extends MvpBasePresenter&lt;CollRunnin
         }
         if (historyTrackRequest == null) {
-            historyTrackRequest = new HistoryTrackRequest(tag, StepService.serviceId, entityName);
+            historyTrackRequest = new HistoryTrackRequest(Constant.TAG, Constant.SERVICE_ID, entityName);
             //设置查询设备名称
             historyTrackRequest.setEntityName(entityName);
             //历史轨迹开始时间
@@ -151,7 +150,7 @@ public class CollRunningMapFragmentPresenter extends MvpBasePresenter&lt;CollRunnin
         //创建里程查询
         if (distanceRequest == null) {
             // 创建里程查询请求实例
-            distanceRequest = new DistanceRequest(tag, StepService.serviceId, entityName);
+            distanceRequest = new DistanceRequest(Constant.TAG, Constant.SERVICE_ID, entityName);
             // 设置开始时间
             distanceRequest.setStartTime(startTime);
             // 设置结束时间
@@ -293,8 +292,8 @@ public class CollRunningMapFragmentPresenter extends MvpBasePresenter&lt;CollRunnin
             List<String> names = new ArrayList<>();
             names.add(entityName);
             realTimeListRequest = new LocRequest();
-            realTimeListRequest.setServiceId(StepService.serviceId);
-            realTimeListRequest.setTag(1);
+            realTimeListRequest.setServiceId(Constant.SERVICE_ID);
+            realTimeListRequest.setTag(Constant.TAG);
         }
         if (realTimePoints == null) {
             realTimePoints = new ArrayList<>();
@@ -480,7 +479,7 @@ public class CollRunningMapFragmentPresenter extends MvpBasePresenter&lt;CollRunnin
 //            }
 //        }
-        FenceListRequest request = FenceListRequest.buildServerRequest(tag, StepService.serviceId, "yangshuai", null, CoordType.gcj02);
+        FenceListRequest request = FenceListRequest.buildServerRequest(Constant.TAG, Constant.SERVICE_ID, "yangshuai", null, CoordType.gcj02);
         //发起查询围栏请求
         if (StepService.mClient != null) {
@@ -489,8 +488,8 @@ public class CollRunningMapFragmentPresenter extends MvpBasePresenter&lt;CollRunnin
         List<Long> fenid = new ArrayList<>();
         fenid.add(1L);
-        MonitoredStatusRequest request1 = MonitoredStatusRequest.buildServerRequest(tag,
-                StepService.serviceId, "yangshuai", fenid);
+        MonitoredStatusRequest request1 = MonitoredStatusRequest.buildServerRequest(Constant.TAG,
+                Constant.SERVICE_ID, "yangshuai", fenid);
         Handler handler = new Handler();
         Runnable runnable = new Runnable() {
             @Override
@@ -139,12 +139,6 @@ public class CollStepService extends Service implements SensorEventListener {
      * 轨迹监听器(用于接收纠偏后实时位置回调)
      */
     private OnTrackListener realTimeTraceListener = null;
-    //位置采集周期
-    private int gatherInterval = 3;
-    //打包周期
-    private int packInterval = 10;
-    // 轨迹服务ID
-    public static final long serviceId = 213511;
 //    public static final long serviceId = 213553;//杨帅
     // 设备标识
@@ -179,12 +173,12 @@ public class CollStepService extends Service implements SensorEventListener {
         if (mClient == null) {
             mClient = new LBSTraceClient(getApplicationContext());
             // 设置定位和打包周期
-            mClient.setInterval(gatherInterval, packInterval);
+            mClient.setInterval(Constant.GATHER_INTERVAL, Constant.PACK_INTERVAL);
             //设置定位模式
             mClient.setLocationMode(LocationMode.High_Accuracy);
         }
         if (mTrace == null) {
-            mTrace = new Trace(serviceId, entityName);
+            mTrace = new Trace(Constant.SERVICE_ID, entityName);
         }
         //初始化实时轨迹监听器
         realTimeTraceListener = new OnTrackListener() {
@@ -134,7 +134,7 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
         }
         if (historyTrackRequest == null) {
-            historyTrackRequest = new HistoryTrackRequest(tag, StepService.serviceId, entityName);
+            historyTrackRequest = new HistoryTrackRequest(tag, Constant.SERVICE_ID, entityName);
             //设置查询设备名称
             historyTrackRequest.setEntityName(entityName);
             //历史轨迹开始时间
@@ -170,7 +170,7 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
         //创建里程查询
         if (distanceRequest == null) {
             // 创建里程查询请求实例
-            distanceRequest = new DistanceRequest(tag, StepService.serviceId, entityName);
+            distanceRequest = new DistanceRequest(tag, Constant.SERVICE_ID, entityName);
             // 设置开始时间
             distanceRequest.setStartTime(startTime);
             // 设置结束时间
@@ -317,7 +317,7 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
             List<String> names = new ArrayList<>();
             names.add(entityName);
             realTimeListRequest = new LocRequest();
-            realTimeListRequest.setServiceId(StepService.serviceId);
+            realTimeListRequest.setServiceId(Constant.SERVICE_ID);
             realTimeListRequest.setTag(1);
         }
         if (realTimePoints == null) {
@@ -504,7 +504,7 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
 //            }
 //        }
-        FenceListRequest request = FenceListRequest.buildServerRequest(tag, StepService.serviceId, "yangshuai", null, CoordType.gcj02);
+        FenceListRequest request = FenceListRequest.buildServerRequest(tag, Constant.SERVICE_ID, "yangshuai", null, CoordType.gcj02);
         //发起查询围栏请求
         if (StepService.mClient != null) {
@@ -514,7 +514,7 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
         List<Long> fenid = new ArrayList<>();
         fenid.add(1L);
         MonitoredStatusRequest request1 = MonitoredStatusRequest.buildServerRequest(tag,
-                StepService.serviceId, "yangshuai", fenid);
+                Constant.SERVICE_ID, "yangshuai", fenid);
         Handler handler = new Handler();
         Runnable runnable = new Runnable() {
             @Override
 package com.cnlive.moudle.pedometer.model;
 public class Constant {
+    public static final long SERVICE_ID = 213511;
+    public static final int TAG = 1;
+    public static final  int GATHER_INTERVAL=3;//位置采集周期
+    public static final  int  PACK_INTERVAL =10;//位置采集周期
+
     public static final int SERVICE_STEP_COUNT_UPDATE = 0;//步数更新
     public static final int SERVICE_STEP_COUNT_PAUSE = 1;//步数暂停
     public static final int SERVICE_STEP_COUNT_CONTINUE = 2;//继续计步
@@ -141,13 +141,6 @@ public class StepService extends Service implements SensorEventListener {
      * 轨迹监听器(用于接收纠偏后实时位置回调)
      */
     private OnTrackListener realTimeTraceListener = null;
-    //位置采集周期
-    private int gatherInterval = 3;
-    //打包周期
-    private int packInterval = 10;
-    // 轨迹服务ID
-    public static final long serviceId = 213511;//杨帅
-//    public static final long serviceId = 213553;
     // 设备标识
     public static String entityName = "";
@@ -185,12 +178,12 @@ public class StepService extends Service implements SensorEventListener {
         if (mClient == null) {
             mClient = new LBSTraceClient(getApplicationContext());
             // 设置定位和打包周期
-            mClient.setInterval(gatherInterval, packInterval);
+            mClient.setInterval(Constant.GATHER_INTERVAL, Constant.PACK_INTERVAL);
             //设置定位模式
             mClient.setLocationMode(LocationMode.High_Accuracy);
         }
         if (mTrace == null) {
-            mTrace = new Trace(serviceId, entityName);
+            mTrace = new Trace(Constant.SERVICE_ID, entityName);
         }
         //初始化实时轨迹监听器
         realTimeTraceListener = new OnTrackListener() {
@@ -5,25 +5,51 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Toast;
+import com.baidu.trace.LBSTraceClient;
+import com.baidu.trace.api.fence.AddMonitoredPersonRequest;
+import com.baidu.trace.api.fence.AddMonitoredPersonResponse;
+import com.baidu.trace.api.fence.CreateFenceResponse;
+import com.baidu.trace.api.fence.DeleteFenceResponse;
+import com.baidu.trace.api.fence.DeleteMonitoredPersonResponse;
+import com.baidu.trace.api.fence.FenceListResponse;
+import com.baidu.trace.api.fence.FenceType;
+import com.baidu.trace.api.fence.HistoryAlarmResponse;
+import com.baidu.trace.api.fence.ListMonitoredPersonResponse;
+import com.baidu.trace.api.fence.MonitoredStatus;
+import com.baidu.trace.api.fence.MonitoredStatusByLocationResponse;
+import com.baidu.trace.api.fence.MonitoredStatusInfo;
+import com.baidu.trace.api.fence.MonitoredStatusResponse;
+import com.baidu.trace.api.fence.OnFenceListener;
+import com.baidu.trace.api.fence.UpdateFenceResponse;
+import com.baidu.trace.model.LocationMode;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.presenter.RegistrationInfoPresenter;
 import com.cnlive.moudle.pedometer.frame.view.RegistrationInfoView;
+import com.cnlive.moudle.pedometer.model.Constant;
+import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentRegistrationInfoBinding;
 import com.jzxiang.pickerview.TimePickerDialog;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Created by hanyayun 019/05/29.
  */
-public class RegistrationInfoFragment extends MvpBindingFragment<RegistrationInfoView, RegistrationInfoPresenter,Object, FragmentRegistrationInfoBinding> {
+public class RegistrationInfoFragment extends MvpBindingFragment<RegistrationInfoView, RegistrationInfoPresenter, Object, FragmentRegistrationInfoBinding> {
     public TimePickerDialog pickerDialog;
+    private final String TAG = "RegistrationInfo";
+
     public static RegistrationInfoFragment newInstance() {
         RegistrationInfoFragment fragment = new RegistrationInfoFragment();
         return fragment;
@@ -37,12 +63,101 @@ public class RegistrationInfoFragment extends MvpBindingFragment&lt;RegistrationInf
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        if(getMvpView() != null) getMvpView().initView();
+        if (getMvpView() != null) getMvpView().initView();
     }
-    public void commitInfo(){
-        getPresenter().commitInfo(getActivity(),CommonInfo.getStreetId(getActivity()),"10514343","15210479774",
-                binding.sexText.getText().toString().trim().equals("未选择")?"":binding.sexText.getText().toString().trim(),
-                binding.birthday.getText().toString().trim().equals("未选择")?"":binding.birthday.getText().toString().trim());
+    public void commitInfo() {
+
+//        getPresenter().commitInfo(getActivity(), CommonInfo.getStreetId(getActivity()), "10514343", "15210479774",
+//                binding.sexText.getText().toString().trim().equals("未选择") ? "" : binding.sexText.getText().toString().trim(),
+//                binding.birthday.getText().toString().trim().equals("未选择") ? "" : binding.birthday.getText().toString().trim());
+        addMonitorToFence(1);
     }
+
+    /**
+     * 将对象添加到围栏
+     *
+     * @param fenceId
+     */
+    public void addMonitorToFence(int fenceId) {
+        QMUITipDialogUtil.loadingDialog(getContext(), "请稍后", false);
+        LBSTraceClient mClient = new LBSTraceClient(getContext());
+        // 设置定位和打包周期
+        mClient.setInterval(Constant.GATHER_INTERVAL, Constant.PACK_INTERVAL);
+        //设置定位模式
+        mClient.setLocationMode(LocationMode.High_Accuracy);
+        //将设备添加到围栏中
+        AddMonitoredPersonRequest addMonitoredPersonRequest = AddMonitoredPersonRequest.buildServerRequest(Constant.TAG, Constant.SERVICE_ID, fenceId, CommonInfo.getUserId(getContext()));
+        // 初始化围栏监听器
+        OnFenceListener onFenceListener = new OnFenceListener() {
+            // 创建围栏回调
+            @Override
+            public void onCreateFenceCallback(CreateFenceResponse createFenceResponse) {
+            }
+
+            // 更新围栏回调
+            @Override
+            public void onUpdateFenceCallback(UpdateFenceResponse updateFenceResponse) {
+
+            }
+
+            // 删除围栏回调
+            @Override
+            public void onDeleteFenceCallback(DeleteFenceResponse deleteFenceResponse) {
+
+            }
+
+            // 围栏列表回调
+            @Override
+            public void onFenceListCallback(FenceListResponse fenceListResponse) {
+            }
+
+            // 监控状态回调
+            @Override
+            public void onMonitoredStatusCallback(MonitoredStatusResponse monitoredStatusResponse) {
+            }
+
+            // 指定位置监控状态回调
+            @Override
+            public void onMonitoredStatusByLocationCallback(MonitoredStatusByLocationResponse monitoredStatusByLocationResponse) {
+            }
+
+            // 历史报警回调
+            @Override
+            public void onHistoryAlarmCallback(HistoryAlarmResponse historyAlarmResponse) {
+            }
+
+            @Override
+            public void onAddMonitoredPersonCallback(AddMonitoredPersonResponse addMonitoredPersonResponse) {
+                // 鉴权失败
+                if (addMonitoredPersonResponse.getStatus() == 14004) {
+                    if (mClient != null) {
+                        //将设备添加到围栏中
+                        mClient.addFenceMonitoredPerson(addMonitoredPersonRequest, this);
+                    }
+                } else if (addMonitoredPersonResponse.getStatus() == 0) {
+                    QMUITipDialogUtil.dismessDialog();
+                    getPresenter().commitInfo(getActivity(), CommonInfo.getStreetId(getActivity()), "10514343", "15210479774",
+                            binding.sexText.getText().toString().trim().equals("未选择") ? "" : binding.sexText.getText().toString().trim(),
+                            binding.birthday.getText().toString().trim().equals("未选择") ? "" : binding.birthday.getText().toString().trim());
+                } else {
+                    QMUITipDialogUtil.dismessDialog();
+                }
+
+                Log.e(TAG, "onAddMonitoredPersonCallback: " + addMonitoredPersonResponse.getMessage() + "," + addMonitoredPersonResponse.getStatus());
+            }
+
+            @Override
+            public void onDeleteMonitoredPersonCallback(DeleteMonitoredPersonResponse deleteMonitoredPersonResponse) {
+            }
+
+            @Override
+            public void onListMonitoredPersonCallback(ListMonitoredPersonResponse listMonitoredPersonResponse) {
+            }
+        };
+        //将设备添加到围栏中
+        mClient.addFenceMonitoredPerson(addMonitoredPersonRequest, onFenceListener);
+    }
+
+
 }