杨帅 / XiaojiaSoundBox · Commits

Commit ae8002cd3086e42f975154f1c1ef7c34b8f7a468

Authored by YangShuai
1 parent 7586b257

1 修改配网完成逻辑

Inline Side-by-side
Showing 7 changed files with 12 additions and 2 deletions
config.gradle
  View file @ae8002c
... ... @@ -21,7 +21,7 @@ ext {
21 21 //编译方式
22 22 debug : false,
23 23 //版本号
24   - version: "0.1.17",
  24 + version: "0.1.18",
25 25 //Lib库前缀
26 26 packeg : "com.cnlive.module",
27 27 //Lib库名称
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/BlueToothStep1Activity.java
  View file @ae8002c
... ... @@ -68,6 +68,8 @@ public class BlueToothStep1Activity extends AppCompatActivity {
68 68 public void event(EventMsg msg) {
69 69 if (EventMsg.CLOSE_BLUETOOTH_ACTIVITY == msg.getEventType()) {
70 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
  View file @ae8002c
... ... @@ -254,6 +254,8 @@ public class BlueToothStep2Activity extends AppCompatActivity {
254 254 public void event(EventMsg msg) {
255 255 if (EventMsg.CLOSE_BLUETOOTH_ACTIVITY == msg.getEventType()) {
256 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
  View file @ae8002c
... ... @@ -74,7 +74,7 @@ public class ConnBluetoothSuccessActivity extends AppCompatActivity {
74 74 binding.btnInvitFriend.setOnClickListener(new View.OnClickListener() {
75 75 @Override
76 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
  View file @ae8002c
... ... @@ -70,6 +70,8 @@ public class AllDeviceFragment extends MvpBindingFragment<AllDeviceFragmentView,
70 70 }
71 71 } else if (EventMsg.DELETE_DEVICE_NAME_SUCCESS == msg.getEventType()) {
72 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
  View file @ae8002c
... ... @@ -99,6 +99,8 @@ public class SearchDevicefragment extends MvpBindingFragment<SearchDevicefragmen
99 99 public void event(EventMsg msg) {
100 100 if (EventMsg.CLOSE_BLUETOOTH_ACTIVITY == msg.getEventType()) {
101 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
  View file @ae8002c
... ... @@ -127,6 +127,8 @@ public class SelectWifiFragment extends MvpBindingFragment<SelectWifiFragmentVie
127 127 public void event(EventMsg msg) {
128 128 if (EventMsg.CLOSE_BLUETOOTH_ACTIVITY == msg.getEventType()) {
129 129 getActivity().finish();
  130 + } else if (EventMsg.GO_TO_CHINA_LISTEN_PAGE == msg.getEventType()) {
  131 + getActivity().finish();
130 132 }
131 133 }
132 134 }
... ...