杨帅 / XiaojiaSoundBox · Commits

Commit 3892be01218cc5846f2546a798f893efdabf74cf

Authored by YangShuai
1 parent 2b3c696a

1 对接im数据

Inline Side-by-side
Showing 4 changed files with 6 additions and 5 deletions
app/src/main/java/com/cnlive/strike/xiaojiaspeaker/MainActivity.java
  View file @3892be0
... ... @@ -35,7 +35,7 @@ public class MainActivity extends AppCompatActivity {
35 35 // startActivity(new Intent(MainActivity.this, BluetoothConnActivity.class));
36 36 // startActivity(new Intent(MainActivity.this, BlueToothStep1Activity.class));
37 37 // startActivity(new Intent(MainActivity.this, ConnBluetoothSuccessActivity.class));
38   - startActivity(new Intent(MainActivity.this, AllDeviceActivity.class));
  38 + AllDeviceActivity.startActivity(MainActivity.this,XiaoJIaCommInfo.getUserId(this),"123","123",XiaoJIaCommInfo.getUserPhone(this));
39 39 // startActivity(new Intent(MainActivity.this, DeviceInstructionActivity.class));
40 40 // startActivity(new Intent(MainActivity.this, DeviceManagerActivity.class));
41 41 // startActivity(new Intent(MainActivity.this, FirmwareUpdateActivity.class));
... ...
config.gradle
  View file @3892be0
... ... @@ -21,7 +21,7 @@ ext {
21 21 //编译方式
22 22 debug : false,
23 23 //版本号
24   - version: "0.0.12",
  24 + version: "0.0.13",
25 25 //Lib库前缀
26 26 packeg : "com.cnlive.module",
27 27 //Lib库名称
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/AllDeviceActivity.java
  View file @3892be0
... ... @@ -38,17 +38,18 @@ public class AllDeviceActivity extends AppCompatActivity {
38 38 String userIcon = getIntent().getExtras().getString("userIcon");
39 39 String nickName = getIntent().getExtras().getString("nickName");
40 40 String phone = getIntent().getExtras().getString("phone");
41   - if (!TextUtils.isEmpty(uid) && TextUtils.isEmpty(userIcon) && !TextUtils.isEmpty(nickName) && !TextUtils.isEmpty(phone)) {
  41 + if (!TextUtils.isEmpty(uid) && !TextUtils.isEmpty(userIcon) && !TextUtils.isEmpty(nickName) && !TextUtils.isEmpty(phone)) {
42 42 XiaoJIaCommInfo.setUserId(this, uid);
43 43 XiaoJIaCommInfo.setUserPhone(this, phone);
44 44 XiaoJIaCommInfo.setUserIcon(this, userIcon);
45 45 XiaoJIaCommInfo.setUserNickName(this, nickName);
  46 + getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, AllDeviceFragment.newInstance()).commitAllowingStateLoss();
  47 +
46 48 } else {
47 49 AlertUtil.showDeftToast(this, "参数异常");
48 50 }
49 51  
50 52 }
51   - getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, AllDeviceFragment.newInstance()).commitAllowingStateLoss();
52 53  
53 54 }
54 55  
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/AllDeviceFragment.java
  View file @3892be0
... ... @@ -89,7 +89,7 @@ public class AllDeviceFragment extends MvpBindingFragment<AllDeviceFragmentView,
89 89 binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
90 90 @Override
91 91 public void onClick(View view) {
92   -
  92 + getActivity().finish();
93 93 }
94 94 });
95 95 //添加设备按钮
... ...