文案调整

朱显松
1 parent 758c7d11
Showing 15 changed files with 25 additions and 25 deletions
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/presenter/CollRunningMapFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningFinishFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/StartTraceFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunRaceDetailFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/ALLScoreDetailFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/LineUpAgainPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningFinishFragmetPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningMapFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/UploadFailDetailFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RegistrationInfoFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/MyMapUtil.java
moudle_pedometer/src/main/res/layout/fragment_coll_finish_run_map.xml
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "1.2.6-androidx",
+            version: "1.2.7-androidx",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -176,7 +176,7 @@ public class CollRunningMapFragmentPresenter extends MvpBasePresenter&lt;CollRunnin
                 if (StatusCodes.SUCCESS != response.getStatus()) {
                     Toast.makeText(context, "获取轨迹失败!" + response.getStatus(), Toast.LENGTH_SHORT).show();
                 } else if (0 == total) {
-                    Toast.makeText(context, "暂未查到您的轨迹,请稍后重试!", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(context, "暂未查到您的轨迹,请稍候重试!", Toast.LENGTH_SHORT).show();
                 } else {
                     //查询到轨迹
                     List<TrackPoint> points = response.getTrackPoints();
@@ -181,7 +181,7 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
                 if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
                     //判断是否成功查询到轨迹点
                     if (null == queryResultPoints) {
-                        QMUITipDialogUtil.textDialog(getContext(), "正在获取轨迹信息,请稍后...", 1);
+                        QMUITipDialogUtil.textDialog(getContext(), "正在获取轨迹信息,请稍候...", 1);
                     } else {
                         //隐藏面板视图
 //                    fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
@@ -206,7 +206,7 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
                                     }
                                 }
                                 dialog.dismiss();
-                                showLoading("正在截取赛事图片,请稍后");
+                                showLoading("正在截取赛事图片,请稍候");
                                 //延迟一秒进行截图,以免把打的点都截取到
                                 new Handler().postDelayed(new Runnable() {
                                     @Override
@@ -237,7 +237,7 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
 //                //开始整合数据
 //                //判断是否成功查询到轨迹点
 //                if (null == queryResultPoints) {
-//                    QMUITipDialogUtil.textDialog(getContext(), "正在获取轨迹信息,请稍后...", 1);
+//                    QMUITipDialogUtil.textDialog(getContext(), "正在获取轨迹信息,请稍候...", 1);
 //                } else {
 //                    //隐藏面板视图
 ////                    fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
@@ -258,7 +258,7 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
 //                                }
 //                            }
 //                            dialog.dismiss();
-//                            QMUITipDialogUtil.textDialog(getContext(), "正在截取赛事图片,请稍后", 1);
+//                            QMUITipDialogUtil.textDialog(getContext(), "正在截取赛事图片,请稍候", 1);
 //                            //延迟一秒进行截图,以免把打的点都截取到
 //                            new Handler().postDelayed(new Runnable() {
 //                                @Override
@@ -394,7 +394,7 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
         //禁止点击
         limitUploadBtnTouch();
         if (!TextUtils.isEmpty(roadMapPath)) {
-            showLoading("正在上传赛事图片,请稍后");
+            showLoading("正在上传赛事图片,请稍候");
             List<String> imagePaths = new ArrayList<>();
             imagePaths.add(roadMapPath);
             UploadLogic.uploadAddressPicInfo(getContext(), imagePaths, new Event<String>()
@@ -267,7 +267,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
 //                        selectDialog.show();
 //                    } else {
 //                        isShowFollowAddress = true;
-//                        Toast.makeText(getContext(), "正在获取当前地点信息,请稍后", Toast.LENGTH_SHORT).show();
+//                        Toast.makeText(getContext(), "正在获取当前地点信息,请稍候", Toast.LENGTH_SHORT).show();
 //                    }
                     if (null != followMyLocation) {
@@ -288,7 +288,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
                             }
                         });
                     } else {
-                        Toast.makeText(getContext(), "正在获取当前地点信息,请稍后", Toast.LENGTH_SHORT).show();
+                        Toast.makeText(getContext(), "正在获取当前地点信息,请稍候", Toast.LENGTH_SHORT).show();
                     }
                 } else {
                     Toast.makeText(getContext(), "打点数量超过最大限制,无法打点!", Toast.LENGTH_SHORT).show();
@@ -313,7 +313,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
 //                            endSelectDialog.show();
 //                        } else {
 //                            isShowEndFollowAddress = true;
-//                            Toast.makeText(getContext(), "正在获取当前地点信息,请稍后", Toast.LENGTH_SHORT).show();
+//                            Toast.makeText(getContext(), "正在获取当前地点信息,请稍候", Toast.LENGTH_SHORT).show();
 //                        }
                         QMUITipDialogUtil.loadingDialog(getContext(), "正在获取位置信息...", false);
                         MyMapUtil.getGeoCoderResult(new LatLng(followMyLocation.latitude, followMyLocation.longitude), new MyMapUtil.GeoCodeResult() {
@@ -332,7 +332,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
                         });
                     } else {
                         isShowEndFollowAddress = true;
-                        Toast.makeText(getContext(), "正在获取当前地点信息,请稍后", Toast.LENGTH_SHORT).show();
+                        Toast.makeText(getContext(), "正在获取当前地点信息,请稍候", Toast.LENGTH_SHORT).show();
                     }
                 }
             }
@@ -121,7 +121,7 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
 //                    selectDialog.show();
 //                } else {
 //                    isShowFollowAddress = true;
-//                    Toast.makeText(getContext(), "正在获取当前地点信息,请稍后", Toast.LENGTH_SHORT).show();
+//                    Toast.makeText(getContext(), "正在获取当前地点信息,请稍候", Toast.LENGTH_SHORT).show();
 //                }
                 if (null != followMyLocation) {
                     QMUITipDialogUtil.loadingDialog(getContext(), "正在获取位置信息...", false);
@@ -140,7 +140,7 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
                         }
                     });
                 } else {
-                    Toast.makeText(getContext(), "正在获取当前地点信息,请稍后", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getContext(), "正在获取当前地点信息,请稍候", Toast.LENGTH_SHORT).show();
                 }
@@ -249,7 +249,7 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
      */
     public void startStepService(Context context) {
         CollCommonInfo.setIsFirstStepSendTraceTip(context, true);
-        QMUITipDialogUtil.loadingDialog(context, "请稍后", false);
+        QMUITipDialogUtil.loadingDialog(context, "请稍候", false);
         if (CollCommonInfo.getStepStartTime(context) == 0) {
             CollCommonInfo.setStepStartTime(context, TimeUtil.getNowTimeStamp());
         }
@@ -63,7 +63,7 @@ public class CollRunRaceDetailFragment extends QMUIFragment&lt;CollRunRaceDetailFra
                     if (null != getMvpView().runRaceDetailInfo) {
                         RaceNameListActivity.newInstance(getActivity(), CollCommonInfo.getStreetId(getActivity()), getMvpView().runRaceDetailInfo);
                     } else {
-                        QMUITipDialogUtil.failedDialog(getActivity(), "正在获取数据,请稍后", 1);
+                        QMUITipDialogUtil.failedDialog(getActivity(), "正在获取数据,请稍候", 1);
                     }
                 }
             }
@@ -31,7 +31,7 @@ public class ALLScoreDetailFragmentPresenter extends MvpBasePresenter&lt;ALLScoreDe
      * 查询当前用户历史轨迹
      */
     public void queryHistoryTrace(Activity context, RunningFinishBean runningFinishBean) {
-        QMUITipDialogUtil.loadingDialog(context, "正在获取轨迹信息,请稍后", false);
+        QMUITipDialogUtil.loadingDialog(context, "正在获取轨迹信息,请稍候", false);
         //查询当前用户的历史轨迹
         long startTime = 0;
         if (!TextUtils.isEmpty(runningFinishBean.getUserStartTime())) {
@@ -48,7 +48,7 @@ public class LineUpAgainPresenter extends MvpBasePresenter&lt;LineUpAgainView&gt; {
      * 查询当前用户历史轨迹(用于重新上传按钮)
      */
     public void queryHistoryTraceNoMap(Activity context, FailedEntity failedEntity, onResultListener onResultListener) {
-        QMUITipDialogUtil.loadingDialog(context, "正在获取轨迹信息,请稍后", false);
+        QMUITipDialogUtil.loadingDialog(context, "正在获取轨迹信息,请稍候", false);
         //查询当前用户的历史轨迹
         long startTime = failedEntity.getUserStartTime();
         //获取当前的时间戳(秒)
@@ -187,7 +187,7 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
      * 查询当前用户历史轨迹
      */
     public void queryHistoryTrace(Activity context, UserStepEntity userStepEntity, RunningFinishBean runningFinishBean) {
-        QMUITipDialogUtil.loadingDialog(context, "正在获取轨迹信息,请稍后", false);
+        QMUITipDialogUtil.loadingDialog(context, "正在获取轨迹信息,请稍候", false);
         //查询当前用户的历史轨迹
         long startTime = userStepEntity.getStartTimeStamp();
         //获取当前的时间戳(秒)
@@ -197,7 +197,7 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
 //                if (StatusCodes.SUCCESS != response.getStatus()) {
 //                    Toast.makeText(context, "获取轨迹失败!" + response.getStatus(), Toast.LENGTH_SHORT).show();
 //                } else if (0 == total) {
-//                    Toast.makeText(context, "暂未查到您的轨迹,请稍后重试!", Toast.LENGTH_SHORT).show();
+//                    Toast.makeText(context, "暂未查到您的轨迹,请稍候重试!", Toast.LENGTH_SHORT).show();
 //                } else {
 //                    //查询到轨迹
 //                    List<TrackPoint> points = response.getTrackPoints();
@@ -54,7 +54,7 @@ public class UploadFailDetailFragmentPresenter extends MvpBasePresenter&lt;UploadFa
      * 查询当前用户历史轨迹
      */
     public void queryHistoryTrace(Activity context, FailedEntity failedEntity) {
-        QMUITipDialogUtil.loadingDialog(context, "正在获取轨迹信息,请稍后", false);
+        QMUITipDialogUtil.loadingDialog(context, "正在获取轨迹信息,请稍候", false);
         //查询当前用户的历史轨迹
         long startTime = failedEntity.getUserStartTime();
@@ -595,7 +595,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                         }
                     } else {
-                        QMUITipDialogUtil.textDialog(getContext(), "正在获取赛事,请稍后...", 1);
+                        QMUITipDialogUtil.textDialog(getContext(), "正在获取赛事,请稍候...", 1);
                     }
                 }
                 //继续运动
@@ -1379,7 +1379,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
      */
     public void startStepService(Context context) {
         CommonInfo.setIsFirstStepSendTraceTip(getContext(), true);
-        QMUITipDialogUtil.loadingDialog(getContext(), "请稍后", false);
+        QMUITipDialogUtil.loadingDialog(getContext(), "请稍候", false);
         CommonInfo.setIsRunKeepAliveService(context, true);
         CommonInfo.setIsRunStepService(context, true);
         CommonInfo.setTsRunBaiduTraceService(context, true);
@@ -92,7 +92,7 @@ public class RegistrationInfoFragment extends MvpBindingFragment&lt;RegistrationInf
         if (null == getPresenter()) {
             return;
         }
-        QMUITipDialogUtil.loadingDialog(getContext(), "请稍后", false);
+        QMUITipDialogUtil.loadingDialog(getContext(), "请稍候", false);
         LBSTraceClient mClient = new LBSTraceClient(getContext());
         // 设置定位和打包周期
         mClient.setInterval(Constant.GATHER_INTERVAL, Constant.PACK_INTERVAL);
@@ -548,7 +548,7 @@ public class MyMapUtil {
                         trackPoints.clear();
                     }
                     queryNum = 0;
-                    Toast.makeText(context, "暂未查到您的轨迹,请稍后重试!", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(context, "暂未查到您的轨迹,请稍候重试!", Toast.LENGTH_SHORT).show();
                 } else {
                     queryNum = 0;
                     //查询到轨迹
@@ -165,7 +165,7 @@
                     android:layout_marginRight="15dp"
                     android:layout_marginBottom="15dp"
                     android:textSize="13sp"
-                    android:text="正在截取赛事图片,请稍后"
+                    android:text="正在截取赛事图片,请稍候"
                     android:textColor="@color/white" />
             </LinearLayout>
         </LinearLayout>