1 去除测试提示语

杨帅
1 parent 06016401
Showing 6 changed files with 44 additions and 31 deletions
app/src/main/java/com/example/modulepedometer/MainActivity.java
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/service/CollStepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/StepService.java
moudle_pedometer/src/main/res/layout/fragment_run_line.xml
@@ -22,8 +22,8 @@ public class MainActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-//        String uid = "358916";
-        String uid = "358689";
+        String uid = "358916";
+//        String uid = "358689";
         findViewById(R.id.recordd).setOnClickListener(new View.OnClickListener() {
             @Override
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.6.9",
+            version: "0.6.10",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -229,7 +229,8 @@ public class CollStepService extends Service implements SensorEventListener {
                     if (mClient != null) {
                         retryIndex = 0;
                         mClient.startGather(traceListener);
-                        Toast.makeText(getApplicationContext(), "开启轨迹服务", Toast.LENGTH_LONG).show();
+                        Log.e(TAG, "开启轨迹服务" );
+//                        Toast.makeText(getApplicationContext(), "开启轨迹服务", Toast.LENGTH_LONG).show();
                         boolean isFirstSendNotification = CollCommonInfo.getIsFirstStepSendTraceTip(getApplicationContext());
                         if (isFirstSendNotification) {
                             CollCommonInfo.setIsFirstStepSendTraceTip(getApplicationContext(), false);
@@ -273,7 +274,8 @@ public class CollStepService extends Service implements SensorEventListener {
                 if (StatusCodes.SUCCESS == errorNo || StatusCodes.CACHE_TRACK_NOT_UPLOAD == errorNo) {
                     if (mClient != null) {
                         mClient.stopTrace(mTrace, traceListener);
-                        Toast.makeText(getApplicationContext(), "停止轨迹服务", Toast.LENGTH_LONG).show();
+                        Log.e(TAG, "停止轨迹服务" );
+//                        Toast.makeText(getApplicationContext(), "停止轨迹服务", Toast.LENGTH_LONG).show();
                     }
                 }
             }
@@ -293,7 +295,8 @@ public class CollStepService extends Service implements SensorEventListener {
                 Log.e(TAG, "onStartGatherCallback: " + message + "," + errorNo);
                 if (StatusCodes.SUCCESS == errorNo || StatusCodes.GATHER_STARTED == errorNo) {
                     retryIndex = 0;
-                    Toast.makeText(getApplicationContext(), "开始采集", Toast.LENGTH_LONG).show();
+                    Log.e(TAG, "开始采集" );
+//                    Toast.makeText(getApplicationContext(), "开始采集", Toast.LENGTH_LONG).show();
                 } else {
                     //重新开启采集
                     if (retryIndex < 4) {
@@ -320,7 +323,8 @@ public class CollStepService extends Service implements SensorEventListener {
             @Override
             public void onStopGatherCallback(int errorNo, String message) {
                 if (StatusCodes.SUCCESS == errorNo || StatusCodes.GATHER_STOPPED == errorNo) {
-                    Toast.makeText(getApplicationContext(), "停止采集", Toast.LENGTH_LONG).show();
+                    Log.e(TAG, "停止采集" );
+//                    Toast.makeText(getApplicationContext(), "停止采集", Toast.LENGTH_LONG).show();
                     if (mClient != null) {
                         mClient.stopTrace(mTrace, traceListener);
                     }
@@ -545,7 +545,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                         }
                     } else {
-                        QMUITipDialogUtil.textDialog(getContext(), "正在获取轨迹请稍后...", 1);
+                        QMUITipDialogUtil.textDialog(getContext(), "正在获取赛事,请稍后...", 1);
                     }
                 }
                 //继续运动
@@ -108,23 +108,23 @@ public class StepService extends Service implements SensorEventListener {
     /**
      * 当前所走的步数
      */
-    private  int CURRENT_STEP = 0;
+    private int CURRENT_STEP = 0;
     /**
      * 计步传感器类型  Sensor.TYPE_STEP_COUNTER或者Sensor.TYPE_STEP_DETECTOR
      */
-    private  int stepSensorType = -1;
+    private int stepSensorType = -1;
     /**
      * 每次第一次启动记步服务时是否从系统中获取了已有的步数记录
      */
-    private  boolean hasRecord = false;
+    private boolean hasRecord = false;
     /**
      * 系统中获取到的已有的步数
      */
-    private  int hasStepCount = 0;
+    private int hasStepCount = 0;
     /**
      * 上一次的步数
      */
-    private  int previousStepCount = 0;
+    private int previousStepCount = 0;
     /**
      * 加速度传感器中获取的步数
      */
@@ -247,7 +247,8 @@ public class StepService extends Service implements SensorEventListener {
                     if (mClient != null) {
                         retryIndex = 0;
                         mClient.startGather(traceListener);
-                        Toast.makeText(getApplicationContext(), "开启轨迹服务", Toast.LENGTH_LONG).show();
+                        Log.e(TAG, "开启轨迹服务");
+//                        Toast.makeText(getApplicationContext(), "开启轨迹服务", Toast.LENGTH_LONG).show();
                         boolean isFirstSendNotification = CommonInfo.getIsFirstStepSendTraceTip(getApplicationContext());
                         if (isFirstSendNotification) {
                             CommonInfo.setIsFirstStepSendTraceTip(getApplicationContext(), false);
@@ -292,7 +293,8 @@ public class StepService extends Service implements SensorEventListener {
                 if (StatusCodes.SUCCESS == errorNo || StatusCodes.CACHE_TRACK_NOT_UPLOAD == errorNo) {
                     if (mClient != null) {
                         mClient.stopTrace(mTrace, traceListener);
-                        Toast.makeText(getApplicationContext(), "停止轨迹服务", Toast.LENGTH_LONG).show();
+                        Log.e(TAG, "停止轨迹服务");
+//                        Toast.makeText(getApplicationContext(), "停止轨迹服务", Toast.LENGTH_LONG).show();
                     }
                 }
@@ -312,7 +314,8 @@ public class StepService extends Service implements SensorEventListener {
             public void onStartGatherCallback(int errorNo, String message) {
                 if (StatusCodes.SUCCESS == errorNo || StatusCodes.GATHER_STARTED == errorNo) {
                     retryIndex = 0;
-                    Toast.makeText(getApplicationContext(), "开始采集", Toast.LENGTH_LONG).show();
+                    Log.e(TAG, "开始采集");
+//                    Toast.makeText(getApplicationContext(), "开始采集", Toast.LENGTH_LONG).show();
                 } else {
                     //重新开启采集
                     if (retryIndex < 4) {
@@ -337,7 +340,8 @@ public class StepService extends Service implements SensorEventListener {
             @Override
             public void onStopGatherCallback(int errorNo, String message) {
                 if (StatusCodes.SUCCESS == errorNo || StatusCodes.GATHER_STOPPED == errorNo) {
-                    Toast.makeText(getApplicationContext(), "停止采集", Toast.LENGTH_LONG).show();
+                    Log.e(TAG, "停止采集");
+//                    Toast.makeText(getApplicationContext(), "停止采集", Toast.LENGTH_LONG).show();
                     if (mClient != null) {
                         mClient.stopTrace(mTrace, traceListener);
                     }
@@ -361,9 +365,9 @@ public class StepService extends Service implements SensorEventListener {
             public void onPushCallback(byte messageType, PushMessage pushMessage) {
                 Log.e(TAG, "onPushCallback: ");
-                if (messageType < 0x03 || messageType > 0x04) {
-                    return;
-                }
+//                if (messageType < 0x03 || messageType > 0x04) {
+//                    return;
+//                }
                 FenceAlarmPushInfo alarmPushInfo = pushMessage.getFenceAlarmPushInfo();
                 if (null == alarmPushInfo) {
                     return;
@@ -381,7 +385,7 @@ public class StepService extends Service implements SensorEventListener {
                     else if (alarmPushInfo.getMonitoredAction() == MonitoredAction.enter) {
                         EventBus.getDefault().post(new MessageEvent(Constant.ENTER_RANGE, ""));
                     }
-                    Toast.makeText(getApplicationContext(), "onPushCallback:" + alarmPushInfo.getMonitoredAction(), Toast.LENGTH_SHORT).show();
+//                    Toast.makeText(getApplicationContext(), "onPushCallback:" + alarmPushInfo.getMonitoredAction(), Toast.LENGTH_SHORT).show();
                 }
             }
@@ -404,9 +408,12 @@ public class StepService extends Service implements SensorEventListener {
             // 创建围栏回调
             @Override
             public void onCreateFenceCallback(CreateFenceResponse createFenceResponse) {
-                if ("成功".equals(createFenceResponse.getMessage())) {
+                if (null == createFenceResponse) {
+                    return;
+                }
+                if (0 == createFenceResponse.getStatus()) {
 //                    Toast.makeText(context, "创建围栏回调成功", Toast.LENGTH_SHORT).show();
-                    Log.e(TAG, "onCreateFenceCallback: " + createFenceResponse.getFenceId());
+//                    Log.e(TAG, "onCreateFenceCallback: " + createFenceResponse.getFenceId());
                     // 查询围栏监控者状态
                     List<Long> list = new ArrayList<>();
                     list.add(createFenceResponse.getFenceId());
@@ -438,11 +445,12 @@ public class StepService extends Service implements SensorEventListener {
             // 监控状态回调
             @Override
             public void onMonitoredStatusCallback(MonitoredStatusResponse monitoredStatusResponse) {
-                if (monitoredStatusResponse.getMonitoredStatusInfos() != null) {
-                    Toast.makeText(getApplicationContext(), "围栏列表回调成功:个数:" + monitoredStatusResponse.getMonitoredStatusInfos().size(), Toast.LENGTH_SHORT).show();
+                if (monitoredStatusResponse.getMonitoredStatusInfos() == null || null == monitoredStatusResponse) {
+                    return;
+//                    Toast.makeText(getApplicationContext(), "围栏列表回调成功:个数:" + monitoredStatusResponse.getMonitoredStatusInfos().size(), Toast.LENGTH_SHORT).show();
                 } //查询监控对象状态响应结果
                 List<MonitoredStatusInfo> monitoredStatusInfos = monitoredStatusResponse.getMonitoredStatusInfos();
-                if (monitoredStatusInfos == null||TextUtils.isEmpty(userStepEntity.getFenceId())) {
+                if (monitoredStatusInfos == null || TextUtils.isEmpty(userStepEntity.getFenceId())) {
                     return;
                 }
                 for (MonitoredStatusInfo monitoredStatusInfo : monitoredStatusInfos) {
@@ -451,18 +459,18 @@ public class StepService extends Service implements SensorEventListener {
                         switch (status) {
                             case in:
                                 //监控的设备在围栏内
-                                Toast.makeText(getApplicationContext(), "监控的设备在围栏内", Toast.LENGTH_SHORT).show();
+//                                Toast.makeText(getApplicationContext(), "监控的设备在围栏内", Toast.LENGTH_SHORT).show();
                                 Log.e(TAG, "监控的设备在围栏内: ");
                                 break;
                             case out:
                                 //监控的设备在围栏外
-                                Toast.makeText(getApplicationContext(), "监控的设备在围栏外", Toast.LENGTH_SHORT).show();
+//                                Toast.makeText(getApplicationContext(), "监控的设备在围栏外", Toast.LENGTH_SHORT).show();
                                 Log.e(TAG, "监控的设备在围栏外: ");
                                 break;
                             case unknown:
                                 //监控的设备状态未知
-                                Toast.makeText(getApplicationContext(), "监控的设备状态未知", Toast.LENGTH_SHORT).show();
+//                                Toast.makeText(getApplicationContext(), "监控的设备状态未知", Toast.LENGTH_SHORT).show();
                                 Log.e(TAG, "监控的设备状态未知: ");
                                 break;
@@ -498,7 +506,7 @@ public class StepService extends Service implements SensorEventListener {
                 Log.e(TAG, "onListMonitoredPersonCallback: ");
             }
         };
-        if (userStepEntity != null||TextUtils.isEmpty(userStepEntity.getFenceId())) {
+        if (userStepEntity != null || TextUtils.isEmpty(userStepEntity.getFenceId())) {
             List<Long> fenids = new ArrayList<>();
             fenids.add(Long.parseLong(userStepEntity.getFenceId()));
             MonitoredStatusRequest request1 = MonitoredStatusRequest.buildServerRequest(Constant.TAG,
@@ -528,7 +536,7 @@ public class StepService extends Service implements SensorEventListener {
             if (userStepEntity != null) {
                 if (TextUtils.isEmpty(userStepEntity.getFenceId())) {
                     int fenceId = CommonInfo.getFenceId(getApplicationContext());
-                    Log.e(TAG, "onStartTraceCallback: 保存的围栏id" + fenceId);
+//                    Log.e(TAG, "onStartTraceCallback: 保存的围栏id" + fenceId);
                     //设置围栏id
                     StepUtil.setFenceId(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()), fenceId + "");
                 }
@@ -28,6 +28,7 @@
                 android:layout_toRightOf="@id/back_btn"
                 android:drawablePadding="7dp"
                 android:text="@string/beijing"
+                android:visibility="gone"
                 android:textColor="#333333"
                 android:textSize="15sp" />