Commit ae8002cd3086e42f975154f1c1ef7c34b8f7a468
1 parent
7586b257
1 修改配网完成逻辑
Showing
7 changed files
with
12 additions
and
2 deletions
config.gradle
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/BlueToothStep1Activity.java
| @@ -68,6 +68,8 @@ public class BlueToothStep1Activity extends AppCompatActivity { | @@ -68,6 +68,8 @@ public class BlueToothStep1Activity extends AppCompatActivity { | ||
| 68 | public void event(EventMsg msg) { | 68 | public void event(EventMsg msg) { |
| 69 | if (EventMsg.CLOSE_BLUETOOTH_ACTIVITY == msg.getEventType()) { | 69 | if (EventMsg.CLOSE_BLUETOOTH_ACTIVITY == msg.getEventType()) { |
| 70 | finish(); | 70 | finish(); |
| 71 | + }else if (EventMsg.GO_TO_CHINA_LISTEN_PAGE== msg.getEventType()){ | ||
| 72 | + finish(); | ||
| 71 | } | 73 | } |
| 72 | } | 74 | } |
| 73 | } | 75 | } |
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/BlueToothStep2Activity.java
| @@ -254,6 +254,8 @@ public class BlueToothStep2Activity extends AppCompatActivity { | @@ -254,6 +254,8 @@ public class BlueToothStep2Activity extends AppCompatActivity { | ||
| 254 | public void event(EventMsg msg) { | 254 | public void event(EventMsg msg) { |
| 255 | if (EventMsg.CLOSE_BLUETOOTH_ACTIVITY == msg.getEventType()) { | 255 | if (EventMsg.CLOSE_BLUETOOTH_ACTIVITY == msg.getEventType()) { |
| 256 | finish(); | 256 | finish(); |
| 257 | + } else if (EventMsg.GO_TO_CHINA_LISTEN_PAGE == msg.getEventType()) { | ||
| 258 | + finish(); | ||
| 257 | } | 259 | } |
| 258 | } | 260 | } |
| 259 | } | 261 | } |
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ConnBluetoothSuccessActivity.java
| @@ -74,7 +74,7 @@ public class ConnBluetoothSuccessActivity extends AppCompatActivity { | @@ -74,7 +74,7 @@ public class ConnBluetoothSuccessActivity extends AppCompatActivity { | ||
| 74 | binding.btnInvitFriend.setOnClickListener(new View.OnClickListener() { | 74 | binding.btnInvitFriend.setOnClickListener(new View.OnClickListener() { |
| 75 | @Override | 75 | @Override |
| 76 | public void onClick(View view) { | 76 | public void onClick(View view) { |
| 77 | - | 77 | + SelectIMFriendActivity.startActivity(ConnBluetoothSuccessActivity.this,XiaoJIaCommInfo.getFamilyId(ConnBluetoothSuccessActivity.this)); |
| 78 | } | 78 | } |
| 79 | }); | 79 | }); |
| 80 | //修改音箱名称 | 80 | //修改音箱名称 |
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/AllDeviceFragment.java
| @@ -70,6 +70,8 @@ public class AllDeviceFragment extends MvpBindingFragment<AllDeviceFragmentView, | @@ -70,6 +70,8 @@ public class AllDeviceFragment extends MvpBindingFragment<AllDeviceFragmentView, | ||
| 70 | } | 70 | } |
| 71 | } else if (EventMsg.DELETE_DEVICE_NAME_SUCCESS == msg.getEventType()) { | 71 | } else if (EventMsg.DELETE_DEVICE_NAME_SUCCESS == msg.getEventType()) { |
| 72 | getPresenter().getFamilyList(getActivity(), XiaoJIaCommInfo.getUserId(getActivity()), XiaoJIaCommInfo.getUserPhone(getActivity())); | 72 | getPresenter().getFamilyList(getActivity(), XiaoJIaCommInfo.getUserId(getActivity()), XiaoJIaCommInfo.getUserPhone(getActivity())); |
| 73 | + }else if (EventMsg.GO_TO_CHINA_LISTEN_PAGE== msg.getEventType()){ | ||
| 74 | + getActivity().finish(); | ||
| 73 | } | 75 | } |
| 74 | } | 76 | } |
| 75 | 77 |
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SearchDevicefragment.java
| @@ -99,6 +99,8 @@ public class SearchDevicefragment extends MvpBindingFragment<SearchDevicefragmen | @@ -99,6 +99,8 @@ public class SearchDevicefragment extends MvpBindingFragment<SearchDevicefragmen | ||
| 99 | public void event(EventMsg msg) { | 99 | public void event(EventMsg msg) { |
| 100 | if (EventMsg.CLOSE_BLUETOOTH_ACTIVITY == msg.getEventType()) { | 100 | if (EventMsg.CLOSE_BLUETOOTH_ACTIVITY == msg.getEventType()) { |
| 101 | getActivity().finish(); | 101 | getActivity().finish(); |
| 102 | + }else if (EventMsg.GO_TO_CHINA_LISTEN_PAGE== msg.getEventType()){ | ||
| 103 | + getActivity().finish(); | ||
| 102 | } | 104 | } |
| 103 | } | 105 | } |
| 104 | } | 106 | } |
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SelectWifiFragment.java
| @@ -127,6 +127,8 @@ public class SelectWifiFragment extends MvpBindingFragment<SelectWifiFragmentVie | @@ -127,6 +127,8 @@ public class SelectWifiFragment extends MvpBindingFragment<SelectWifiFragmentVie | ||
| 127 | public void event(EventMsg msg) { | 127 | public void event(EventMsg msg) { |
| 128 | if (EventMsg.CLOSE_BLUETOOTH_ACTIVITY == msg.getEventType()) { | 128 | if (EventMsg.CLOSE_BLUETOOTH_ACTIVITY == msg.getEventType()) { |
| 129 | getActivity().finish(); | 129 | getActivity().finish(); |
| 130 | + } else if (EventMsg.GO_TO_CHINA_LISTEN_PAGE == msg.getEventType()) { | ||
| 131 | + getActivity().finish(); | ||
| 130 | } | 132 | } |
| 131 | } | 133 | } |
| 132 | } | 134 | } |