杨帅 / XiaojiaSoundBox · Commits

Commit 3fb023bfa3e6ccf099a7a5a5452f0cb8306c9691

Authored by 朱显松
1 parent 825a0b12

文案调整

Inline Side-by-side
Showing 11 changed files with 21 additions and 21 deletions
config.gradle
  View file @3fb023b
@@ -21,7 +21,7 @@ ext { @@ -21,7 +21,7 @@ ext {
21 //编译方式 21 //编译方式
22 debug : false, 22 debug : false,
23 //版本号 23 //版本号
24 - version: "0.4.0-androidx", 24 + version: "0.4.1-androidx",
25 //Lib库前缀 25 //Lib库前缀
26 packeg : "com.cnlive.module", 26 packeg : "com.cnlive.module",
27 //Lib库名称 27 //Lib库名称
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/ChangeDeviceNamePresenter.java
  View file @3fb023b
@@ -34,7 +34,7 @@ public class ChangeDeviceNamePresenter extends MvpBasePresenter<ChangeDeviceName @@ -34,7 +34,7 @@ public class ChangeDeviceNamePresenter extends MvpBasePresenter<ChangeDeviceName
34 if (null == getView()) { 34 if (null == getView()) {
35 return; 35 return;
36 } 36 }
37 - QMUITipDialogUtil.loadingDialog(context, "请稍后...", false); 37 + QMUITipDialogUtil.loadingDialog(context, "请稍候...", false);
38 Map<String, String> map = new HashMap<>(); 38 Map<String, String> map = new HashMap<>();
39 map.put("devId", deviceId); 39 map.put("devId", deviceId);
40 map.put("newName", newName); 40 map.put("newName", newName);
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/ChangeWifiFragmentPresenter.java
  View file @3fb023b
@@ -33,7 +33,7 @@ public class ChangeWifiFragmentPresenter extends MvpBasePresenter&lt;ChangeWifiFrag @@ -33,7 +33,7 @@ public class ChangeWifiFragmentPresenter extends MvpBasePresenter&lt;ChangeWifiFrag
33 if (null == getView()) { 33 if (null == getView()) {
34 return; 34 return;
35 } 35 }
36 - QMUITipDialogUtil.loadingDialog(context, "请稍后...", false); 36 + QMUITipDialogUtil.loadingDialog(context, "请稍候...", false);
37 Map<String, String> map = new HashMap<>(); 37 Map<String, String> map = new HashMap<>();
38 map.put("devId", devId); 38 map.put("devId", devId);
39 map.put("name", wifiName); 39 map.put("name", wifiName);
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/DeviceManagerFragmentPresenter.java
  View file @3fb023b
@@ -30,7 +30,7 @@ public class DeviceManagerFragmentPresenter extends MvpBasePresenter&lt;DeviceManag @@ -30,7 +30,7 @@ public class DeviceManagerFragmentPresenter extends MvpBasePresenter&lt;DeviceManag
30 if (null == getView()) { 30 if (null == getView()) {
31 return; 31 return;
32 } 32 }
33 - QMUITipDialogUtil.loadingDialog(context, "请稍后", false); 33 + QMUITipDialogUtil.loadingDialog(context, "请稍候", false);
34 Map<String, String> map = new HashMap<>(); 34 Map<String, String> map = new HashMap<>();
35 map.put("devId", deviceId); 35 map.put("devId", deviceId);
36 map.put("oldName", oldName); 36 map.put("oldName", oldName);
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/SelectWifiFragmentPresenter.java
  View file @3fb023b
@@ -97,11 +97,11 @@ public class SelectWifiFragmentPresenter extends MvpBasePresenter&lt;SelectWifiFrag @@ -97,11 +97,11 @@ public class SelectWifiFragmentPresenter extends MvpBasePresenter&lt;SelectWifiFrag
97 // context.finish(); 97 // context.finish();
98 // ConnBluetoothSuccessActivity.startActivity(context); 98 // ConnBluetoothSuccessActivity.startActivity(context);
99 // } else { 99 // } else {
100 -// AlertUtil.showDeftToast(context, "配网失败,请稍后重试"); 100 +// AlertUtil.showDeftToast(context, "配网失败,请稍候重试");
101 // } 101 // }
102 // } else { 102 // } else {
103 // //响应失败 103 // //响应失败
104 -// AlertUtil.showDeftToast(context, "配网失败,请稍后重试"); 104 +// AlertUtil.showDeftToast(context, "配网失败,请稍候重试");
105 // } 105 // }
106 // } 106 // }
107 // 107 //
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/SetFriendsRolePresenter.java
  View file @3fb023b
@@ -64,11 +64,11 @@ public class SetFriendsRolePresenter extends MvpBasePresenter&lt;SetFriendsRoleView @@ -64,11 +64,11 @@ public class SetFriendsRolePresenter extends MvpBasePresenter&lt;SetFriendsRoleView
64 //// context.finish(); 64 //// context.finish();
65 //// ConnBluetoothSuccessActivity.startActivity(context); 65 //// ConnBluetoothSuccessActivity.startActivity(context);
66 //// } else { 66 //// } else {
67 -//// AlertUtil.showDeftToast(context, "配网失败,请稍后重试"); 67 +//// AlertUtil.showDeftToast(context, "配网失败,请稍候重试");
68 //// } 68 //// }
69 //// } else { 69 //// } else {
70 //// //响应失败 70 //// //响应失败
71 -//// AlertUtil.showDeftToast(context, "配网失败,请稍后重试"); 71 +//// AlertUtil.showDeftToast(context, "配网失败,请稍候重试");
72 //// } 72 //// }
73 // } 73 // }
74 // 74 //
@@ -92,7 +92,7 @@ public class SetFriendsRolePresenter extends MvpBasePresenter&lt;SetFriendsRoleView @@ -92,7 +92,7 @@ public class SetFriendsRolePresenter extends MvpBasePresenter&lt;SetFriendsRoleView
92 if (null == getView()) { 92 if (null == getView()) {
93 return; 93 return;
94 } 94 }
95 - QMUITipDialogUtil.loadingDialog(context, "请稍后", true); 95 + QMUITipDialogUtil.loadingDialog(context, "请稍候", true);
96 Map<String, String> map = new HashMap<>(); 96 Map<String, String> map = new HashMap<>();
97 map.put("type", "2");//联系人邀请 97 map.put("type", "2");//联系人邀请
98 map.put("contactsInvite", contactsInvite); 98 map.put("contactsInvite", contactsInvite);
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/UserManagerPresenter.java
  View file @3fb023b
@@ -40,7 +40,7 @@ public class UserManagerPresenter extends MvpBasePresenter&lt;UserManagerView&gt; { @@ -40,7 +40,7 @@ public class UserManagerPresenter extends MvpBasePresenter&lt;UserManagerView&gt; {
40 if (null == getView()) { 40 if (null == getView()) {
41 return; 41 return;
42 } 42 }
43 - QMUITipDialogUtil.loadingDialog(context, "请稍后...", false); 43 + QMUITipDialogUtil.loadingDialog(context, "请稍候...", false);
44 Map<String, String> map = new HashMap<>(); 44 Map<String, String> map = new HashMap<>();
45 map.put("sid", sid); 45 map.put("sid", sid);
46 map.put("familyId", familyId); 46 map.put("familyId", familyId);
@@ -142,7 +142,7 @@ public class UserManagerPresenter extends MvpBasePresenter&lt;UserManagerView&gt; { @@ -142,7 +142,7 @@ public class UserManagerPresenter extends MvpBasePresenter&lt;UserManagerView&gt; {
142 if (null == getView()) { 142 if (null == getView()) {
143 return; 143 return;
144 } 144 }
145 - QMUITipDialogUtil.loadingDialog(context, "请稍后...", false); 145 + QMUITipDialogUtil.loadingDialog(context, "请稍候...", false);
146 Map<String, String> map = new HashMap<>(); 146 Map<String, String> map = new HashMap<>();
147 map.put("sids", sids); 147 map.put("sids", sids);
148 map.put("familyId", familyId); 148 map.put("familyId", familyId);
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/ChangeWifiFragmentView.java
  View file @3fb023b
@@ -63,7 +63,7 @@ public class ChangeWifiFragmentView implements MvpView { @@ -63,7 +63,7 @@ public class ChangeWifiFragmentView implements MvpView {
63 SSID = scanResult.SSID; 63 SSID = scanResult.SSID;
64 BSSID = scanResult.BSSID; 64 BSSID = scanResult.BSSID;
65 if (TextUtils.isEmpty(currentUser.getUserId()) || TextUtils.isEmpty(currentUser.getId())) { 65 if (TextUtils.isEmpty(currentUser.getUserId()) || TextUtils.isEmpty(currentUser.getId())) {
66 - AlertUtil.showDeftToast(getContext(), "参数异常,请稍后重试!"); 66 + AlertUtil.showDeftToast(getContext(), "参数异常,请稍候重试!");
67 return; 67 return;
68 } 68 }
69 //判断是否需要输入密码 69 //判断是否需要输入密码
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SelectWifiFragmentView.java
  View file @3fb023b
@@ -98,7 +98,7 @@ public class SelectWifiFragmentView implements MvpView { @@ -98,7 +98,7 @@ public class SelectWifiFragmentView implements MvpView {
98 String encryptionType = scanResult.capabilities; 98 String encryptionType = scanResult.capabilities;
99 SSID = scanResult.SSID; 99 SSID = scanResult.SSID;
100 if (TextUtils.isEmpty(cmccId) || TextUtils.isEmpty(familyId)) { 100 if (TextUtils.isEmpty(cmccId) || TextUtils.isEmpty(familyId)) {
101 - AlertUtil.showDeftToast(getContext(), "参数异常,请稍后重试!"); 101 + AlertUtil.showDeftToast(getContext(), "参数异常,请稍候重试!");
102 return; 102 return;
103 } 103 }
104 //判断是否需要输入密码 104 //判断是否需要输入密码
@@ -209,7 +209,7 @@ public class SelectWifiFragmentView implements MvpView { @@ -209,7 +209,7 @@ public class SelectWifiFragmentView implements MvpView {
209 if (null == getContext()) { 209 if (null == getContext()) {
210 return; 210 return;
211 } 211 }
212 - QMUITipDialogUtil.loadingDialog(getContext(), "配网中,请稍后...", false); 212 + QMUITipDialogUtil.loadingDialog(getContext(), "配网中,请稍候...", false);
213 213
214 } 214 }
215 215
@@ -217,7 +217,7 @@ public class SelectWifiFragmentView implements MvpView { @@ -217,7 +217,7 @@ public class SelectWifiFragmentView implements MvpView {
217 @Override 217 @Override
218 public void onConnectFail(BleDevice bleDevice, BleException exception) { 218 public void onConnectFail(BleDevice bleDevice, BleException exception) {
219 QMUITipDialogUtil.dismessDialog(); 219 QMUITipDialogUtil.dismessDialog();
220 - AlertUtil.showDeftToast(getContext(), "连接无响应，请稍后重试"); 220 + AlertUtil.showDeftToast(getContext(), "连接无响应，请稍候重试");
221 EventBus.getDefault().post(new EventMsg(EventMsg.DEVICE_NOT_RESPONSE, "")); 221 EventBus.getDefault().post(new EventMsg(EventMsg.DEVICE_NOT_RESPONSE, ""));
222 } 222 }
223 223
@@ -252,7 +252,7 @@ public class SelectWifiFragmentView implements MvpView { @@ -252,7 +252,7 @@ public class SelectWifiFragmentView implements MvpView {
252 @Override 252 @Override
253 public void onWriteFailure(BleException exception) { 253 public void onWriteFailure(BleException exception) {
254 Log.e(TAG, "onWriteFailure: "); 254 Log.e(TAG, "onWriteFailure: ");
255 - AlertUtil.showDeftToast(getContext(), "连接无响应，请稍后重试"); 255 + AlertUtil.showDeftToast(getContext(), "连接无响应，请稍候重试");
256 256
257 } 257 }
258 }); 258 });
@@ -262,7 +262,7 @@ public class SelectWifiFragmentView implements MvpView { @@ -262,7 +262,7 @@ public class SelectWifiFragmentView implements MvpView {
262 @Override 262 @Override
263 public void onNotifyFailure(BleException exception) { 263 public void onNotifyFailure(BleException exception) {
264 QMUITipDialogUtil.dismessDialog(); 264 QMUITipDialogUtil.dismessDialog();
265 - AlertUtil.showDeftToast(getContext(), "连接无响应，请稍后重试"); 265 + AlertUtil.showDeftToast(getContext(), "连接无响应，请稍候重试");
266 } 266 }
267 267
268 @Override 268 @Override
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/BluetoothConnActivity.java
  View file @3fb023b
@@ -188,7 +188,7 @@ public class BluetoothConnActivity extends AppCompatActivity { @@ -188,7 +188,7 @@ public class BluetoothConnActivity extends AppCompatActivity {
188 } else { 188 } else {
189 // 开始搜索 189 // 开始搜索
190 mBluetoothAdapter.startDiscovery(); 190 mBluetoothAdapter.startDiscovery();
191 -// QMUITipDialogUtil.loadingDialog(this, "正在搜索蓝牙设备，请稍后...", false); 191 +// QMUITipDialogUtil.loadingDialog(this, "正在搜索蓝牙设备，请稍候...", false);
192 192
193 } 193 }
194 194
@@ -358,7 +358,7 @@ public class BluetoothConnActivity extends AppCompatActivity { @@ -358,7 +358,7 @@ public class BluetoothConnActivity extends AppCompatActivity {
358 // if (progressDialog == null) { 358 // if (progressDialog == null) {
359 // progressDialog = new ProgressDialog(BluetoothConnActivity.this); 359 // progressDialog = new ProgressDialog(BluetoothConnActivity.this);
360 // } 360 // }
361 -// progressDialog.setMessage("正在配对中，请稍后！"); 361 +// progressDialog.setMessage("正在配对中，请稍候！");
362 // progressDialog.show(); 362 // progressDialog.show();
363 break; 363 break;
364 case BluetoothDevice.BOND_BONDED://配对结束 364 case BluetoothDevice.BOND_BONDED://配对结束
@@ -401,7 +401,7 @@ public class BluetoothConnActivity extends AppCompatActivity { @@ -401,7 +401,7 @@ public class BluetoothConnActivity extends AppCompatActivity {
401 switch (blueState) { 401 switch (blueState) {
402 case BluetoothAdapter.STATE_TURNING_ON: 402 case BluetoothAdapter.STATE_TURNING_ON:
403 Log.e(TAG, "监听到蓝牙已开启"); 403 Log.e(TAG, "监听到蓝牙已开启");
404 -// mdialog = LoadingUtil.dialog(BluetoothConnActivity.this, "正在开启蓝牙，请稍后...", false); 404 +// mdialog = LoadingUtil.dialog(BluetoothConnActivity.this, "正在开启蓝牙，请稍候...", false);
405 // mdialog.show(); 405 // mdialog.show();
406 break; 406 break;
407 case BluetoothAdapter.STATE_ON: 407 case BluetoothAdapter.STATE_ON:
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/RemoteControlActivity.java
  View file @3fb023b
@@ -187,7 +187,7 @@ public class RemoteControlActivity extends AppCompatActivity { @@ -187,7 +187,7 @@ public class RemoteControlActivity extends AppCompatActivity {
187 * @param type 187 * @param type
188 */ 188 */
189 public void setRemoteControlStatus(Context context, String sid, String type) { 189 public void setRemoteControlStatus(Context context, String sid, String type) {
190 - QMUITipDialogUtil.loadingDialog(context, "请稍后...", false); 190 + QMUITipDialogUtil.loadingDialog(context, "请稍候...", false);
191 Map<String, String> map = new HashMap<>(); 191 Map<String, String> map = new HashMap<>();
192 map.put("sid", sid); 192 map.put("sid", sid);
193 map.put("type", type); 193 map.put("type", type);