Commit 32d2d7b87212e17d3980327299b220eed8052e1b

Authored by YangShuai
1 parent 3c167497

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.3.11", 24 + version: "0.3.12",
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/ui/activity/ChangeDeviceNameActivity.java
@@ -34,7 +34,7 @@ public class ChangeDeviceNameActivity extends AppCompatActivity { @@ -34,7 +34,7 @@ public class ChangeDeviceNameActivity extends AppCompatActivity {
34 if (null!=getIntent().getExtras()){ 34 if (null!=getIntent().getExtras()){
35 String deviceId=getIntent().getExtras().getString("deviceId"); 35 String deviceId=getIntent().getExtras().getString("deviceId");
36 String oldName=getIntent().getExtras().getString("oldName"); 36 String oldName=getIntent().getExtras().getString("oldName");
37 - if (!TextUtils.isEmpty(deviceId)&&!TextUtils.isEmpty(oldName)){ 37 + if (!TextUtils.isEmpty(deviceId)){
38 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, ChangeDeviceNameFragment.newInstance(deviceId,oldName)).commitAllowingStateLoss(); 38 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, ChangeDeviceNameFragment.newInstance(deviceId,oldName)).commitAllowingStateLoss();
39 } 39 }
40 } 40 }
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/ChangeDeviceNameFragment.java
@@ -43,7 +43,7 @@ public class ChangeDeviceNameFragment extends MvpBindingFragment<ChangeDeviceNam @@ -43,7 +43,7 @@ public class ChangeDeviceNameFragment extends MvpBindingFragment<ChangeDeviceNam
43 if (null != getArguments()) { 43 if (null != getArguments()) {
44 String deviceId= getArguments().getString("deviceId"); 44 String deviceId= getArguments().getString("deviceId");
45 String oldName= getArguments().getString("oldName"); 45 String oldName= getArguments().getString("oldName");
46 - if (!TextUtils.isEmpty(deviceId)&&!TextUtils.isEmpty(oldName)) { 46 + if (!TextUtils.isEmpty(deviceId)) {
47 getMvpView().initView(deviceId,oldName); 47 getMvpView().initView(deviceId,oldName);
48 } 48 }
49 } 49 }