CNLive Android Team / ModulePedometer · Commits

Commit 0ca30f550507603ee82e3b12aa521438e0dbef57

Authored by 朱显松
1 parent 758c7d11

文案调整

Inline Side-by-side
Showing 15 changed files with 25 additions and 25 deletions
config.gradle
  View file @0ca30f5
... ... @@ -21,7 +21,7 @@ ext {
21 21 //编译方式
22 22 debug : false,
23 23 //版本号
24   - version: "1.2.6-androidx",
  24 + version: "1.2.7-androidx",
25 25 //Lib库前缀
26 26 packeg : "com.cnlive.module",
27 27 //Lib库名称
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/presenter/CollRunningMapFragmentPresenter.java
  View file @0ca30f5
... ... @@ -176,7 +176,7 @@ public class CollRunningMapFragmentPresenter extends MvpBasePresenter<CollRunnin
176 176 if (StatusCodes.SUCCESS != response.getStatus()) {
177 177 Toast.makeText(context, "获取轨迹失败!" + response.getStatus(), Toast.LENGTH_SHORT).show();
178 178 } else if (0 == total) {
179   - Toast.makeText(context, "暂未查到您的轨迹,请稍后重试!", Toast.LENGTH_SHORT).show();
  179 + Toast.makeText(context, "暂未查到您的轨迹,请稍候重试!", Toast.LENGTH_SHORT).show();
180 180 } else {
181 181 //查询到轨迹
182 182 List<TrackPoint> points = response.getTrackPoints();
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningFinishFragmentView.java
  View file @0ca30f5
... ... @@ -181,7 +181,7 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
181 181 if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
182 182 //判断是否成功查询到轨迹点
183 183 if (null == queryResultPoints) {
184   - QMUITipDialogUtil.textDialog(getContext(), "正在获取轨迹信息,请稍后...", 1);
  184 + QMUITipDialogUtil.textDialog(getContext(), "正在获取轨迹信息,请稍候...", 1);
185 185 } else {
186 186 //隐藏面板视图
187 187 // fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
... ... @@ -206,7 +206,7 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
206 206 }
207 207 }
208 208 dialog.dismiss();
209   - showLoading("正在截取赛事图片,请稍后");
  209 + showLoading("正在截取赛事图片,请稍候");
210 210 //延迟一秒进行截图,以免把打的点都截取到
211 211 new Handler().postDelayed(new Runnable() {
212 212 @Override
... ... @@ -237,7 +237,7 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
237 237 // //开始整合数据
238 238 // //判断是否成功查询到轨迹点
239 239 // if (null == queryResultPoints) {
240   -// QMUITipDialogUtil.textDialog(getContext(), "正在获取轨迹信息,请稍后...", 1);
  240 +// QMUITipDialogUtil.textDialog(getContext(), "正在获取轨迹信息,请稍候...", 1);
241 241 // } else {
242 242 // //隐藏面板视图
243 243 //// fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
... ... @@ -258,7 +258,7 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
258 258 // }
259 259 // }
260 260 // dialog.dismiss();
261   -// QMUITipDialogUtil.textDialog(getContext(), "正在截取赛事图片,请稍后", 1);
  261 +// QMUITipDialogUtil.textDialog(getContext(), "正在截取赛事图片,请稍候", 1);
262 262 // //延迟一秒进行截图,以免把打的点都截取到
263 263 // new Handler().postDelayed(new Runnable() {
264 264 // @Override
... ... @@ -394,7 +394,7 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
394 394 //禁止点击
395 395 limitUploadBtnTouch();
396 396 if (!TextUtils.isEmpty(roadMapPath)) {
397   - showLoading("正在上传赛事图片,请稍后");
  397 + showLoading("正在上传赛事图片,请稍候");
398 398 List<String> imagePaths = new ArrayList<>();
399 399 imagePaths.add(roadMapPath);
400 400 UploadLogic.uploadAddressPicInfo(getContext(), imagePaths, new Event<String>()
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningMapFragmentView.java
  View file @0ca30f5
... ... @@ -267,7 +267,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener
267 267 // selectDialog.show();
268 268 // } else {
269 269 // isShowFollowAddress = true;
270   -// Toast.makeText(getContext(), "正在获取当前地点信息,请稍后", Toast.LENGTH_SHORT).show();
  270 +// Toast.makeText(getContext(), "正在获取当前地点信息,请稍候", Toast.LENGTH_SHORT).show();
271 271 // }
272 272  
273 273 if (null != followMyLocation) {
... ... @@ -288,7 +288,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener
288 288 }
289 289 });
290 290 } else {
291   - Toast.makeText(getContext(), "正在获取当前地点信息,请稍后", Toast.LENGTH_SHORT).show();
  291 + Toast.makeText(getContext(), "正在获取当前地点信息,请稍候", Toast.LENGTH_SHORT).show();
292 292 }
293 293 } else {
294 294 Toast.makeText(getContext(), "打点数量超过最大限制,无法打点!", Toast.LENGTH_SHORT).show();
... ... @@ -313,7 +313,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener
313 313 // endSelectDialog.show();
314 314 // } else {
315 315 // isShowEndFollowAddress = true;
316   -// Toast.makeText(getContext(), "正在获取当前地点信息,请稍后", Toast.LENGTH_SHORT).show();
  316 +// Toast.makeText(getContext(), "正在获取当前地点信息,请稍候", Toast.LENGTH_SHORT).show();
317 317 // }
318 318 QMUITipDialogUtil.loadingDialog(getContext(), "正在获取位置信息...", false);
319 319 MyMapUtil.getGeoCoderResult(new LatLng(followMyLocation.latitude, followMyLocation.longitude), new MyMapUtil.GeoCodeResult() {
... ... @@ -332,7 +332,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener
332 332 });
333 333 } else {
334 334 isShowEndFollowAddress = true;
335   - Toast.makeText(getContext(), "正在获取当前地点信息,请稍后", Toast.LENGTH_SHORT).show();
  335 + Toast.makeText(getContext(), "正在获取当前地点信息,请稍候", Toast.LENGTH_SHORT).show();
336 336 }
337 337 }
338 338 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/StartTraceFragmentView.java
  View file @0ca30f5
... ... @@ -121,7 +121,7 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
121 121 // selectDialog.show();
122 122 // } else {
123 123 // isShowFollowAddress = true;
124   -// Toast.makeText(getContext(), "正在获取当前地点信息,请稍后", Toast.LENGTH_SHORT).show();
  124 +// Toast.makeText(getContext(), "正在获取当前地点信息,请稍候", Toast.LENGTH_SHORT).show();
125 125 // }
126 126 if (null != followMyLocation) {
127 127 QMUITipDialogUtil.loadingDialog(getContext(), "正在获取位置信息...", false);
... ... @@ -140,7 +140,7 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
140 140 }
141 141 });
142 142 } else {
143   - Toast.makeText(getContext(), "正在获取当前地点信息,请稍后", Toast.LENGTH_SHORT).show();
  143 + Toast.makeText(getContext(), "正在获取当前地点信息,请稍候", Toast.LENGTH_SHORT).show();
144 144 }
145 145  
146 146  
... ... @@ -249,7 +249,7 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
249 249 */
250 250 public void startStepService(Context context) {
251 251 CollCommonInfo.setIsFirstStepSendTraceTip(context, true);
252   - QMUITipDialogUtil.loadingDialog(context, "请稍后", false);
  252 + QMUITipDialogUtil.loadingDialog(context, "请稍候", false);
253 253 if (CollCommonInfo.getStepStartTime(context) == 0) {
254 254 CollCommonInfo.setStepStartTime(context, TimeUtil.getNowTimeStamp());
255 255 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunRaceDetailFragment.java
  View file @0ca30f5
... ... @@ -63,7 +63,7 @@ public class CollRunRaceDetailFragment extends QMUIFragment&lt;CollRunRaceDetailFra
63 63 if (null != getMvpView().runRaceDetailInfo) {
64 64 RaceNameListActivity.newInstance(getActivity(), CollCommonInfo.getStreetId(getActivity()), getMvpView().runRaceDetailInfo);
65 65 } else {
66   - QMUITipDialogUtil.failedDialog(getActivity(), "正在获取数据,请稍后", 1);
  66 + QMUITipDialogUtil.failedDialog(getActivity(), "正在获取数据,请稍候", 1);
67 67 }
68 68 }
69 69 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/ALLScoreDetailFragmentPresenter.java
  View file @0ca30f5
... ... @@ -31,7 +31,7 @@ public class ALLScoreDetailFragmentPresenter extends MvpBasePresenter&lt;ALLScoreDe
31 31 * 查询当前用户历史轨迹
32 32 */
33 33 public void queryHistoryTrace(Activity context, RunningFinishBean runningFinishBean) {
34   - QMUITipDialogUtil.loadingDialog(context, "正在获取轨迹信息,请稍后", false);
  34 + QMUITipDialogUtil.loadingDialog(context, "正在获取轨迹信息,请稍候", false);
35 35 //查询当前用户的历史轨迹
36 36 long startTime = 0;
37 37 if (!TextUtils.isEmpty(runningFinishBean.getUserStartTime())) {
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/LineUpAgainPresenter.java
  View file @0ca30f5
... ... @@ -48,7 +48,7 @@ public class LineUpAgainPresenter extends MvpBasePresenter&lt;LineUpAgainView&gt; {
48 48 * 查询当前用户历史轨迹(用于重新上传按钮)
49 49 */
50 50 public void queryHistoryTraceNoMap(Activity context, FailedEntity failedEntity, onResultListener onResultListener) {
51   - QMUITipDialogUtil.loadingDialog(context, "正在获取轨迹信息,请稍后", false);
  51 + QMUITipDialogUtil.loadingDialog(context, "正在获取轨迹信息,请稍候", false);
52 52 //查询当前用户的历史轨迹
53 53 long startTime = failedEntity.getUserStartTime();
54 54 //获取当前的时间戳(秒)
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningFinishFragmetPresenter.java
  View file @0ca30f5
... ... @@ -187,7 +187,7 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
187 187 * 查询当前用户历史轨迹
188 188 */
189 189 public void queryHistoryTrace(Activity context, UserStepEntity userStepEntity, RunningFinishBean runningFinishBean) {
190   - QMUITipDialogUtil.loadingDialog(context, "正在获取轨迹信息,请稍后", false);
  190 + QMUITipDialogUtil.loadingDialog(context, "正在获取轨迹信息,请稍候", false);
191 191 //查询当前用户的历史轨迹
192 192 long startTime = userStepEntity.getStartTimeStamp();
193 193 //获取当前的时间戳(秒)
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningMapFragmentPresenter.java
  View file @0ca30f5
... ... @@ -197,7 +197,7 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
197 197 // if (StatusCodes.SUCCESS != response.getStatus()) {
198 198 // Toast.makeText(context, "获取轨迹失败!" + response.getStatus(), Toast.LENGTH_SHORT).show();
199 199 // } else if (0 == total) {
200   -// Toast.makeText(context, "暂未查到您的轨迹,请稍后重试!", Toast.LENGTH_SHORT).show();
  200 +// Toast.makeText(context, "暂未查到您的轨迹,请稍候重试!", Toast.LENGTH_SHORT).show();
201 201 // } else {
202 202 // //查询到轨迹
203 203 // List<TrackPoint> points = response.getTrackPoints();
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/UploadFailDetailFragmentPresenter.java
  View file @0ca30f5
... ... @@ -54,7 +54,7 @@ public class UploadFailDetailFragmentPresenter extends MvpBasePresenter&lt;UploadFa
54 54 * 查询当前用户历史轨迹
55 55 */
56 56 public void queryHistoryTrace(Activity context, FailedEntity failedEntity) {
57   - QMUITipDialogUtil.loadingDialog(context, "正在获取轨迹信息,请稍后", false);
  57 + QMUITipDialogUtil.loadingDialog(context, "正在获取轨迹信息,请稍候", false);
58 58  
59 59 //查询当前用户的历史轨迹
60 60 long startTime = failedEntity.getUserStartTime();
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
  View file @0ca30f5
... ... @@ -595,7 +595,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
595 595 }
596 596  
597 597 } else {
598   - QMUITipDialogUtil.textDialog(getContext(), "正在获取赛事,请稍后...", 1);
  598 + QMUITipDialogUtil.textDialog(getContext(), "正在获取赛事,请稍候...", 1);
599 599 }
600 600 }
601 601 //继续运动
... ... @@ -1379,7 +1379,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
1379 1379 */
1380 1380 public void startStepService(Context context) {
1381 1381 CommonInfo.setIsFirstStepSendTraceTip(getContext(), true);
1382   - QMUITipDialogUtil.loadingDialog(getContext(), "请稍后", false);
  1382 + QMUITipDialogUtil.loadingDialog(getContext(), "请稍候", false);
1383 1383 CommonInfo.setIsRunKeepAliveService(context, true);
1384 1384 CommonInfo.setIsRunStepService(context, true);
1385 1385 CommonInfo.setTsRunBaiduTraceService(context, true);
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RegistrationInfoFragment.java
  View file @0ca30f5
... ... @@ -92,7 +92,7 @@ public class RegistrationInfoFragment extends MvpBindingFragment&lt;RegistrationInf
92 92 if (null == getPresenter()) {
93 93 return;
94 94 }
95   - QMUITipDialogUtil.loadingDialog(getContext(), "请稍后", false);
  95 + QMUITipDialogUtil.loadingDialog(getContext(), "请稍候", false);
96 96 LBSTraceClient mClient = new LBSTraceClient(getContext());
97 97 // 设置定位和打包周期
98 98 mClient.setInterval(Constant.GATHER_INTERVAL, Constant.PACK_INTERVAL);
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/MyMapUtil.java
  View file @0ca30f5
... ... @@ -548,7 +548,7 @@ public class MyMapUtil {
548 548 trackPoints.clear();
549 549 }
550 550 queryNum = 0;
551   - Toast.makeText(context, "暂未查到您的轨迹,请稍后重试!", Toast.LENGTH_SHORT).show();
  551 + Toast.makeText(context, "暂未查到您的轨迹,请稍候重试!", Toast.LENGTH_SHORT).show();
552 552 } else {
553 553 queryNum = 0;
554 554 //查询到轨迹
... ...
moudle_pedometer/src/main/res/layout/fragment_coll_finish_run_map.xml
  View file @0ca30f5
... ... @@ -165,7 +165,7 @@
165 165 android:layout_marginRight="15dp"
166 166 android:layout_marginBottom="15dp"
167 167 android:textSize="13sp"
168   - android:text="正在截取赛事图片,请稍后"
  168 + android:text="正在截取赛事图片,请稍候"
169 169 android:textColor="@color/white" />
170 170 </LinearLayout>
171 171 </LinearLayout>
... ...