杨帅 / 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 17 <uses-permission android:name="android.permission.INTERNET" />
18 18  
19 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 24 <activity
22 25 android:name=".ui.activity.RemoteControlActivity"
  26 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
23 27 android:screenOrientation="portrait" />
24 28 <activity
25 29 android:name=".ui.activity.ShareFriendActivity"
  30 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
26 31 android:screenOrientation="portrait" />
27 32 <activity
28 33 android:name=".ui.activity.InvitFriendActivity"
  34 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
29 35 android:screenOrientation="portrait" />
30 36 <activity
31 37 android:name=".ui.activity.DeviceInfoActivity"
  38 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
32 39 android:screenOrientation="portrait" />
33 40 <activity
34 41 android:name=".ui.activity.UserManagerActivity"
  42 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
35 43 android:screenOrientation="portrait" />
36 44 <activity
37 45 android:name=".ui.activity.ChangeDeviceNameActivity"
  46 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
38 47 android:screenOrientation="portrait" />
39 48 <activity
40 49 android:name=".ui.activity.DeviceDetailActivity"
  50 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
41 51 android:screenOrientation="portrait" />
42 52 <activity
43 53 android:name=".ui.activity.SetFriendsRoleActivity"
  54 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
44 55 android:screenOrientation="portrait" />
45 56 <activity
46 57 android:name=".ui.activity.SelectIMFriendActivity"
  58 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
47 59 android:screenOrientation="portrait" />
48 60 <activity
49 61 android:name=".ui.activity.FirmwareUpdateActivity"
  62 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
50 63 android:screenOrientation="portrait" />
51 64 <activity
52 65 android:name=".ui.activity.DeviceManagerActivity"
  66 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
53 67 android:screenOrientation="portrait" />
54 68 <activity
55 69 android:name=".ui.activity.DeviceInstructionActivity"
  70 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
56 71 android:screenOrientation="portrait" />
57 72 <activity
58 73 android:name=".ui.activity.AllDeviceActivity"
  74 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
59 75 android:screenOrientation="portrait" />
60 76 <activity
61 77 android:name=".ui.activity.ConnBluetoothSuccessActivity"
  78 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
62 79 android:screenOrientation="portrait" />
63 80 <activity
64 81 android:name=".ui.activity.SelectWifiActivity"
  82 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
65 83 android:screenOrientation="portrait" />
66 84 <activity
67 85 android:name=".ui.activity.BlueToothStep2Activity"
  86 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
68 87 android:screenOrientation="portrait" />
69 88 <activity
70 89 android:name=".ui.activity.BlueToothStep1Activity"
  90 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
71 91 android:screenOrientation="portrait" />
72 92 <activity
73 93 android:name=".ui.activity.BlueToothHelpActivity"
  94 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
74 95 android:screenOrientation="portrait" />
75 96 <activity
76 97 android:name=".ui.activity.SearchDeviceActivity"
  98 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
77 99 android:screenOrientation="portrait" />
78 100 <activity
79 101 android:name=".ui.activity.SpeakerMainActivity"
  102 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
80 103 android:screenOrientation="portrait" />
81 104 <activity
82 105 android:name=".ui.activity.BluetoothConnActivity"
  106 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
83 107 android:screenOrientation="portrait" />
84 108 <activity
85 109 android:name=".ui.activity.ChangeWifiActivity"
  110 + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
86 111 android:screenOrientation="portrait" />
87 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 23 // 音箱返回状态
24 24 public static final String SSID_RECEIVED = "ssid received";
25 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 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 272 }
273 273 try {
274 274 String result = new String(data, "UTF-8");
275   - Log.e(TAG, "onCharacteristicChanged: " + result);
  275 +// Log.e(TAG, "onCharacteristicChanged: " + result);
276 276 if (result.indexOf(BlufiConstants.WIFI_LINK_OK) != -1) {
277 277 isSetNetSuccess = true;
278 278 BleManager.getInstance().stopNotify(bleDevice, BlufiConstants.UUID_WIFI_SERVICE.toString(), BlufiConstants.UUID_NOTIFY_CHARACTERISTIC.toString());
... ...