Commit aedde39e5ca698d495ca51d1f2d497df5460c00a

Authored by YangShuai
1 parent bb3c6fb6

1 跳转到听见中国

config.gradle
@@ -21,7 +21,7 @@ ext { @@ -21,7 +21,7 @@ ext {
21 //编译方式 21 //编译方式
22 debug : false, 22 debug : false,
23 //版本号 23 //版本号
24 - version: "0.1.12", 24 + version: "0.1.13",
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/view/UserManagerView.java
@@ -145,10 +145,10 @@ public class UserManagerView implements MvpView { @@ -145,10 +145,10 @@ public class UserManagerView implements MvpView {
145 }, "确定", new SelectDialog.DialogInterface() { 145 }, "确定", new SelectDialog.DialogInterface() {
146 @Override 146 @Override
147 public void onClick(SelectDialog dialog) { 147 public void onClick(SelectDialog dialog) {
  148 + dialog.dismiss();
148 fragment.getPresenter().changeMemberRole(getContext(), bean.getSid() + "", bean.getFamily_id(), null, new UserManagerPresenter.OnResposeListener() { 149 fragment.getPresenter().changeMemberRole(getContext(), bean.getSid() + "", bean.getFamily_id(), null, new UserManagerPresenter.OnResposeListener() {
149 @Override 150 @Override
150 public void onSuccess() { 151 public void onSuccess() {
151 - dialog.dismiss();  
152 familyRoleList.remove(position); 152 familyRoleList.remove(position);
153 if (null != adapter) { 153 if (null != adapter) {
154 adapter.notifyDataSetChanged(); 154 adapter.notifyDataSetChanged();
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/model/message/EventMsg.java
@@ -5,6 +5,7 @@ public class EventMsg { @@ -5,6 +5,7 @@ public class EventMsg {
5 public static final int DELETE_DEVICE_NAME_SUCCESS = 1;//删除设备成功 5 public static final int DELETE_DEVICE_NAME_SUCCESS = 1;//删除设备成功
6 public static final int CLOSE_BLUETOOTH_ACTIVITY = 2;//关闭配网页面 6 public static final int CLOSE_BLUETOOTH_ACTIVITY = 2;//关闭配网页面
7 public static final int INVIT_FRIEND_SUCCESS = 3;//邀请好友成功页面 7 public static final int INVIT_FRIEND_SUCCESS = 3;//邀请好友成功页面
  8 + public static final int GO_TO_CHINA_LISTEN_PAGE = 4;//邀请好友成功页面
8 9
9 private int eventType; 10 private int eventType;
10 private Object data; 11 private Object data;
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ConnBluetoothSuccessActivity.java
@@ -14,10 +14,13 @@ import com.cnlive.libs.base.util.StatusBarUtil2; @@ -14,10 +14,13 @@ import com.cnlive.libs.base.util.StatusBarUtil2;
14 import com.cnlive.strike.xiaojiaspeaker.R; 14 import com.cnlive.strike.xiaojiaspeaker.R;
15 import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo; 15 import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
16 import com.cnlive.strike.xiaojiaspeaker.databinding.ActivityConnBluetoothSuccessBinding; 16 import com.cnlive.strike.xiaojiaspeaker.databinding.ActivityConnBluetoothSuccessBinding;
  17 +import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
17 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.NetworkResultBean; 18 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.NetworkResultBean;
18 import com.daimajia.androidanimations.library.Techniques; 19 import com.daimajia.androidanimations.library.Techniques;
19 import com.daimajia.androidanimations.library.YoYo; 20 import com.daimajia.androidanimations.library.YoYo;
20 21
  22 +import org.greenrobot.eventbus.EventBus;
  23 +
21 /** 24 /**
22 * 音箱连接成功页面 25 * 音箱连接成功页面
23 * 26 *
@@ -50,6 +53,8 @@ public class ConnBluetoothSuccessActivity extends AppCompatActivity { @@ -50,6 +53,8 @@ public class ConnBluetoothSuccessActivity extends AppCompatActivity {
50 binding.tvGoToListenChina.setOnClickListener(new View.OnClickListener() { 53 binding.tvGoToListenChina.setOnClickListener(new View.OnClickListener() {
51 @Override 54 @Override
52 public void onClick(View view) { 55 public void onClick(View view) {
  56 + EventBus.getDefault().post(new EventMsg(EventMsg.GO_TO_CHINA_LISTEN_PAGE,""));
  57 + finish();
53 } 58 }
54 }); 59 });
55 //礼物弹窗关闭 60 //礼物弹窗关闭