杨帅 / XiaojiaSoundBox · Commits

Commit 0ebd8f69474a56adbe94c01908049543e87d99ba

Authored by YangShuai
1 parent 74d3784b

1 修改配网逻辑

Inline Side-by-side
Showing 3 changed files with 28 additions and 5 deletions
module_xiaojiaSoundBox/src/main/AndroidManifest.xml
  View file @0ebd8f6
@@ -17,72 +17,97 @@ @@ -17,72 +17,97 @@
17 <uses-permission android:name="android.permission.INTERNET" /> 17 <uses-permission android:name="android.permission.INTERNET" />
18 18
19 <application> 19 <application>
20 - <activity android:name=".ui.activity.ConnFailActivity"></activity> 20 + <activity
  21 + android:name=".ui.activity.ConnFailActivity"
  22 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
  23 + android:screenOrientation="portrait"></activity>
21 <activity 24 <activity
22 android:name=".ui.activity.RemoteControlActivity" 25 android:name=".ui.activity.RemoteControlActivity"
  26 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
23 android:screenOrientation="portrait" /> 27 android:screenOrientation="portrait" />
24 <activity 28 <activity
25 android:name=".ui.activity.ShareFriendActivity" 29 android:name=".ui.activity.ShareFriendActivity"
  30 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
26 android:screenOrientation="portrait" /> 31 android:screenOrientation="portrait" />
27 <activity 32 <activity
28 android:name=".ui.activity.InvitFriendActivity" 33 android:name=".ui.activity.InvitFriendActivity"
  34 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
29 android:screenOrientation="portrait" /> 35 android:screenOrientation="portrait" />
30 <activity 36 <activity
31 android:name=".ui.activity.DeviceInfoActivity" 37 android:name=".ui.activity.DeviceInfoActivity"
  38 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
32 android:screenOrientation="portrait" /> 39 android:screenOrientation="portrait" />
33 <activity 40 <activity
34 android:name=".ui.activity.UserManagerActivity" 41 android:name=".ui.activity.UserManagerActivity"
  42 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
35 android:screenOrientation="portrait" /> 43 android:screenOrientation="portrait" />
36 <activity 44 <activity
37 android:name=".ui.activity.ChangeDeviceNameActivity" 45 android:name=".ui.activity.ChangeDeviceNameActivity"
  46 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
38 android:screenOrientation="portrait" /> 47 android:screenOrientation="portrait" />
39 <activity 48 <activity
40 android:name=".ui.activity.DeviceDetailActivity" 49 android:name=".ui.activity.DeviceDetailActivity"
  50 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
41 android:screenOrientation="portrait" /> 51 android:screenOrientation="portrait" />
42 <activity 52 <activity
43 android:name=".ui.activity.SetFriendsRoleActivity" 53 android:name=".ui.activity.SetFriendsRoleActivity"
  54 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
44 android:screenOrientation="portrait" /> 55 android:screenOrientation="portrait" />
45 <activity 56 <activity
46 android:name=".ui.activity.SelectIMFriendActivity" 57 android:name=".ui.activity.SelectIMFriendActivity"
  58 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
47 android:screenOrientation="portrait" /> 59 android:screenOrientation="portrait" />
48 <activity 60 <activity
49 android:name=".ui.activity.FirmwareUpdateActivity" 61 android:name=".ui.activity.FirmwareUpdateActivity"
  62 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
50 android:screenOrientation="portrait" /> 63 android:screenOrientation="portrait" />
51 <activity 64 <activity
52 android:name=".ui.activity.DeviceManagerActivity" 65 android:name=".ui.activity.DeviceManagerActivity"
  66 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
53 android:screenOrientation="portrait" /> 67 android:screenOrientation="portrait" />
54 <activity 68 <activity
55 android:name=".ui.activity.DeviceInstructionActivity" 69 android:name=".ui.activity.DeviceInstructionActivity"
  70 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
56 android:screenOrientation="portrait" /> 71 android:screenOrientation="portrait" />
57 <activity 72 <activity
58 android:name=".ui.activity.AllDeviceActivity" 73 android:name=".ui.activity.AllDeviceActivity"
  74 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
59 android:screenOrientation="portrait" /> 75 android:screenOrientation="portrait" />
60 <activity 76 <activity
61 android:name=".ui.activity.ConnBluetoothSuccessActivity" 77 android:name=".ui.activity.ConnBluetoothSuccessActivity"
  78 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
62 android:screenOrientation="portrait" /> 79 android:screenOrientation="portrait" />
63 <activity 80 <activity
64 android:name=".ui.activity.SelectWifiActivity" 81 android:name=".ui.activity.SelectWifiActivity"
  82 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
65 android:screenOrientation="portrait" /> 83 android:screenOrientation="portrait" />
66 <activity 84 <activity
67 android:name=".ui.activity.BlueToothStep2Activity" 85 android:name=".ui.activity.BlueToothStep2Activity"
  86 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
68 android:screenOrientation="portrait" /> 87 android:screenOrientation="portrait" />
69 <activity 88 <activity
70 android:name=".ui.activity.BlueToothStep1Activity" 89 android:name=".ui.activity.BlueToothStep1Activity"
  90 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
71 android:screenOrientation="portrait" /> 91 android:screenOrientation="portrait" />
72 <activity 92 <activity
73 android:name=".ui.activity.BlueToothHelpActivity" 93 android:name=".ui.activity.BlueToothHelpActivity"
  94 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
74 android:screenOrientation="portrait" /> 95 android:screenOrientation="portrait" />
75 <activity 96 <activity
76 android:name=".ui.activity.SearchDeviceActivity" 97 android:name=".ui.activity.SearchDeviceActivity"
  98 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
77 android:screenOrientation="portrait" /> 99 android:screenOrientation="portrait" />
78 <activity 100 <activity
79 android:name=".ui.activity.SpeakerMainActivity" 101 android:name=".ui.activity.SpeakerMainActivity"
  102 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
80 android:screenOrientation="portrait" /> 103 android:screenOrientation="portrait" />
81 <activity 104 <activity
82 android:name=".ui.activity.BluetoothConnActivity" 105 android:name=".ui.activity.BluetoothConnActivity"
  106 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
83 android:screenOrientation="portrait" /> 107 android:screenOrientation="portrait" />
84 <activity 108 <activity
85 android:name=".ui.activity.ChangeWifiActivity" 109 android:name=".ui.activity.ChangeWifiActivity"
  110 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
86 android:screenOrientation="portrait" /> 111 android:screenOrientation="portrait" />
87 </application> 112 </application>
88 113
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/constants/BlufiConstants.java
  View file @0ebd8f6
@@ -23,8 +23,6 @@ public final class BlufiConstants { @@ -23,8 +23,6 @@ public final class BlufiConstants {
23 // 音箱返回状态 23 // 音箱返回状态
24 public static final String SSID_RECEIVED = "ssid received"; 24 public static final String SSID_RECEIVED = "ssid received";
25 public static final String WIFI_LINKING = "WiFi Linking"; 25 public static final String WIFI_LINKING = "WiFi Linking";
26 - public static final String WIFI_LINK_OK = "WiFi Link OK"; 26 + public static final String WIFI_LINK_OK = "bind success";
27 public static final String WIFI_LINK_FAIL = "WiFi Link Fail"; 27 public static final String WIFI_LINK_FAIL = "WiFi Link Fail";
28 -  
29 -  
30 } 28 }
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SelectWifiFragmentView.java
  View file @0ebd8f6
@@ -272,7 +272,7 @@ public class SelectWifiFragmentView implements MvpView { @@ -272,7 +272,7 @@ public class SelectWifiFragmentView implements MvpView {
272 } 272 }
273 try { 273 try {
274 String result = new String(data, "UTF-8"); 274 String result = new String(data, "UTF-8");
275 - Log.e(TAG, "onCharacteristicChanged: " + result); 275 +// Log.e(TAG, "onCharacteristicChanged: " + result);
276 if (result.indexOf(BlufiConstants.WIFI_LINK_OK) != -1) { 276 if (result.indexOf(BlufiConstants.WIFI_LINK_OK) != -1) {
277 isSetNetSuccess = true; 277 isSetNetSuccess = true;
278 BleManager.getInstance().stopNotify(bleDevice, BlufiConstants.UUID_WIFI_SERVICE.toString(), BlufiConstants.UUID_NOTIFY_CHARACTERISTIC.toString()); 278 BleManager.getInstance().stopNotify(bleDevice, BlufiConstants.UUID_WIFI_SERVICE.toString(), BlufiConstants.UUID_NOTIFY_CHARACTERISTIC.toString());