杨帅 / XiaojiaSoundBox · Commits

Commit 9ad337a60fa8dc104d70c3f419a36a88d8d87662

Authored by YangShuai
1 parent 7f0792a4

1 优化网络请求逻辑

Inline Side-by-side
Showing 8 changed files with 54 additions and 53 deletions
config.gradle
  View file @9ad337a
@@ -21,7 +21,7 @@ ext { @@ -21,7 +21,7 @@ ext {
21 //编译方式 21 //编译方式
22 debug : false, 22 debug : false,
23 //版本号 23 //版本号
24 - version: "0.2.20", 24 + version: "0.2.21",
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/presenter/AllDeviceFragmentPresenter.java
  View file @9ad337a
@@ -56,6 +56,9 @@ public class AllDeviceFragmentPresenter extends MvpBasePresenter<AllDeviceFragme @@ -56,6 +56,9 @@ public class AllDeviceFragmentPresenter extends MvpBasePresenter<AllDeviceFragme
56 .setFailureCallback(new FailureCallback() { 56 .setFailureCallback(new FailureCallback() {
57 @Override 57 @Override
58 public void onFailure(int i, String s) { 58 public void onFailure(int i, String s) {
  59 + if (null==getView()){
  60 + return;
  61 + }
59 //显示重试 62 //显示重试
60 getView().showRetryView(i, new View.OnClickListener() { 63 getView().showRetryView(i, new View.OnClickListener() {
61 @Override 64 @Override
@@ -96,6 +99,9 @@ public class AllDeviceFragmentPresenter extends MvpBasePresenter<AllDeviceFragme @@ -96,6 +99,9 @@ public class AllDeviceFragmentPresenter extends MvpBasePresenter<AllDeviceFragme
96 .setFailureCallback(new FailureCallback() { 99 .setFailureCallback(new FailureCallback() {
97 @Override 100 @Override
98 public void onFailure(int i, String s) { 101 public void onFailure(int i, String s) {
  102 + if (null==getView()){
  103 + return;
  104 + }
99 //显示重试 105 //显示重试
100 Log.e(TAG, "onFailure: "); 106 Log.e(TAG, "onFailure: ");
101 QMUITipDialogUtil.dismessDialog(); 107 QMUITipDialogUtil.dismessDialog();
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/ChangeDeviceNamePresenter.java
  View file @9ad337a
@@ -63,7 +63,6 @@ public class ChangeDeviceNamePresenter extends MvpBasePresenter<ChangeDeviceName @@ -63,7 +63,6 @@ public class ChangeDeviceNamePresenter extends MvpBasePresenter<ChangeDeviceName
63 @Override 63 @Override
64 public void onFailure(int i, String s) { 64 public void onFailure(int i, String s) {
65 //显示重试 65 //显示重试
66 - Log.e(TAG, "onFailure: " + s);  
67 if (null == getView()) { 66 if (null == getView()) {
68 return; 67 return;
69 } 68 }
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/ChangeWifiFragmentPresenter.java
  View file @9ad337a
@@ -64,7 +64,6 @@ public class ChangeWifiFragmentPresenter extends MvpBasePresenter<ChangeWifiFrag @@ -64,7 +64,6 @@ public class ChangeWifiFragmentPresenter extends MvpBasePresenter<ChangeWifiFrag
64 @Override 64 @Override
65 public void onFailure(int i, String s) { 65 public void onFailure(int i, String s) {
66 //显示重试 66 //显示重试
67 - Log.e(TAG, "onFailure: " + s);  
68 if (null == getView()) { 67 if (null == getView()) {
69 return; 68 return;
70 } 69 }
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/DeviceManagerFragmentPresenter.java
  View file @9ad337a
@@ -101,6 +101,9 @@ public class DeviceManagerFragmentPresenter extends MvpBasePresenter<DeviceManag @@ -101,6 +101,9 @@ public class DeviceManagerFragmentPresenter extends MvpBasePresenter<DeviceManag
101 .setFailureCallback(new FailureCallback() { 101 .setFailureCallback(new FailureCallback() {
102 @Override 102 @Override
103 public void onFailure(int i, String s) { 103 public void onFailure(int i, String s) {
  104 + if (null==getView()){
  105 + return;
  106 + }
104 //显示重试 107 //显示重试
105 getView().showRetryView(i, new View.OnClickListener() { 108 getView().showRetryView(i, new View.OnClickListener() {
106 @Override 109 @Override
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/SelectIMFriendPresenter.java
  View file @9ad337a
@@ -41,7 +41,6 @@ public class SelectIMFriendPresenter extends MvpBasePresenter<SelectIMFriendView @@ -41,7 +41,6 @@ public class SelectIMFriendPresenter extends MvpBasePresenter<SelectIMFriendView
41 .setSuccessCallback(new SuccessCallback<APIBaseInfo<XiaoJiaContactInfo>>() { 41 .setSuccessCallback(new SuccessCallback<APIBaseInfo<XiaoJiaContactInfo>>() {
42 @Override 42 @Override
43 public void onSuccess(APIBaseInfo<XiaoJiaContactInfo> baseInfo) { 43 public void onSuccess(APIBaseInfo<XiaoJiaContactInfo> baseInfo) {
44 - Log.e(TAG, "onSuccess: ");  
45 if (null == getView()) { 44 if (null == getView()) {
46 return; 45 return;
47 } 46 }
@@ -52,7 +51,6 @@ public class SelectIMFriendPresenter extends MvpBasePresenter&lt;SelectIMFriendView @@ -52,7 +51,6 @@ public class SelectIMFriendPresenter extends MvpBasePresenter&lt;SelectIMFriendView
52 @Override 51 @Override
53 public void onFailure(int i, String s) { 52 public void onFailure(int i, String s) {
54 //显示重试 53 //显示重试
55 - Log.e(TAG, "onFailure: " + s);  
56 if (null == getView()) { 54 if (null == getView()) {
57 return; 55 return;
58 } 56 }
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/SetFriendsRolePresenter.java
  View file @9ad337a
@@ -42,42 +42,45 @@ public class SetFriendsRolePresenter extends MvpBasePresenter&lt;SetFriendsRoleView @@ -42,42 +42,45 @@ public class SetFriendsRolePresenter extends MvpBasePresenter&lt;SetFriendsRoleView
42 private String TAG = "SetFriendsRolePresenter"; 42 private String TAG = "SetFriendsRolePresenter";
43 43
44 44
45 - public void queryConfigDeviceNetResult(Activity context, String contactsInvite) {  
46 - InvitFamilyBean1 bean1 = new InvitFamilyBean1();  
47 - bean1.setType("2");  
48 - bean1.setContactsInvite(GsonUtil.jsonToList(contactsInvite, InvitFamilyBean1.ContactsInviteBean.class));  
49 -  
50 - CmccRequest.getInstance(context, ApiServiceCMCC.class)  
51 - .invitFamilyMember(bean1)  
52 - .enqueue(new Callback<APIBaseInfo>() {  
53 - @Override  
54 - public void onResponse(Call<APIBaseInfo> call, Response<APIBaseInfo> response) {  
55 - if (null == getView()) {  
56 - return;  
57 - }  
58 - QMUITipDialogUtil.dismessDialog();  
59 -// ConfigDeviceNetResult result = response.body();  
60 -// //响应成功  
61 -// if (CmccRequest.SUCCRSS == result.getResult()) {  
62 -// Log.e(TAG, "onResponse: ");  
63 -// if ("success".equals(result.getData().getResult())) {  
64 -// context.finish();  
65 -// ConnBluetoothSuccessActivity.startActivity(context);  
66 -// } else {  
67 -// AlertUtil.showDeftToast(context, "配网失败,请稍后重试");  
68 -// }  
69 -// } else {  
70 -// //响应失败  
71 -// AlertUtil.showDeftToast(context, "配网失败,请稍后重试"); 45 +// public void queryConfigDeviceNetResult(Activity context, String contactsInvite) {
  46 +// InvitFamilyBean1 bean1 = new InvitFamilyBean1();
  47 +// bean1.setType("2");
  48 +// bean1.setContactsInvite(GsonUtil.jsonToList(contactsInvite, InvitFamilyBean1.ContactsInviteBean.class));
  49 +//
  50 +// CmccRequest.getInstance(context, ApiServiceCMCC.class)
  51 +// .invitFamilyMember(bean1)
  52 +// .enqueue(new Callback<APIBaseInfo>() {
  53 +// @Override
  54 +// public void onResponse(Call<APIBaseInfo> call, Response<APIBaseInfo> response) {
  55 +// if (null == getView()) {
  56 +// return;
72 // } 57 // }
73 - }  
74 -  
75 - @Override  
76 - public void onFailure(Call<APIBaseInfo> call, Throwable t) {  
77 - QMUITipDialogUtil.dismessDialog();  
78 - }  
79 - });  
80 - } 58 +// QMUITipDialogUtil.dismessDialog();
  59 +//// ConfigDeviceNetResult result = response.body();
  60 +//// //响应成功
  61 +//// if (CmccRequest.SUCCRSS == result.getResult()) {
  62 +//// Log.e(TAG, "onResponse: ");
  63 +//// if ("success".equals(result.getData().getResult())) {
  64 +//// context.finish();
  65 +//// ConnBluetoothSuccessActivity.startActivity(context);
  66 +//// } else {
  67 +//// AlertUtil.showDeftToast(context, "配网失败,请稍后重试");
  68 +//// }
  69 +//// } else {
  70 +//// //响应失败
  71 +//// AlertUtil.showDeftToast(context, "配网失败,请稍后重试");
  72 +//// }
  73 +// }
  74 +//
  75 +// @Override
  76 +// public void onFailure(Call<APIBaseInfo> call, Throwable t) {
  77 +// if (null==getView()){
  78 +// return;
  79 +// }
  80 +// QMUITipDialogUtil.dismessDialog();
  81 +// }
  82 +// });
  83 +// }
81 84
82 /** 85 /**
83 * 设置家庭角色 86 * 设置家庭角色
@@ -103,8 +106,6 @@ public class SetFriendsRolePresenter extends MvpBasePresenter&lt;SetFriendsRoleView @@ -103,8 +106,6 @@ public class SetFriendsRolePresenter extends MvpBasePresenter&lt;SetFriendsRoleView
103 .setSuccessCallback(new SuccessCallback<APIBaseInfo>() { 106 .setSuccessCallback(new SuccessCallback<APIBaseInfo>() {
104 @Override 107 @Override
105 public void onSuccess(APIBaseInfo baseInfo) { 108 public void onSuccess(APIBaseInfo baseInfo) {
106 - Log.e(TAG, "onSuccess: ");  
107 -  
108 if (null == getView()) { 109 if (null == getView()) {
109 return; 110 return;
110 } 111 }
@@ -159,8 +160,6 @@ public class SetFriendsRolePresenter extends MvpBasePresenter&lt;SetFriendsRoleView @@ -159,8 +160,6 @@ public class SetFriendsRolePresenter extends MvpBasePresenter&lt;SetFriendsRoleView
159 .setSuccessCallback(new SuccessCallback<APIBaseInfo<RoleNetBean>>() { 160 .setSuccessCallback(new SuccessCallback<APIBaseInfo<RoleNetBean>>() {
160 @Override 161 @Override
161 public void onSuccess(APIBaseInfo<RoleNetBean> baseInfo) { 162 public void onSuccess(APIBaseInfo<RoleNetBean> baseInfo) {
162 - Log.e(TAG, "onSuccess: ");  
163 -  
164 if (null == getView()) { 163 if (null == getView()) {
165 return; 164 return;
166 } 165 }
@@ -172,8 +171,10 @@ public class SetFriendsRolePresenter extends MvpBasePresenter&lt;SetFriendsRoleView @@ -172,8 +171,10 @@ public class SetFriendsRolePresenter extends MvpBasePresenter&lt;SetFriendsRoleView
172 .setFailureCallback(new FailureCallback() { 171 .setFailureCallback(new FailureCallback() {
173 @Override 172 @Override
174 public void onFailure(int i, String s) { 173 public void onFailure(int i, String s) {
  174 + if (null==getView()){
  175 + return;
  176 + }
175 //显示重试 177 //显示重试
176 - Log.e(TAG, "onFailure: " + s);  
177 getView().showRetryView(i, new View.OnClickListener() { 178 getView().showRetryView(i, new View.OnClickListener() {
178 @Override 179 @Override
179 public void onClick(View view) { 180 public void onClick(View view) {
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/UserManagerPresenter.java
  View file @9ad337a
@@ -57,8 +57,6 @@ public class UserManagerPresenter extends MvpBasePresenter&lt;UserManagerView&gt; { @@ -57,8 +57,6 @@ public class UserManagerPresenter extends MvpBasePresenter&lt;UserManagerView&gt; {
57 .setSuccessCallback(new SuccessCallback<APIBaseInfo>() { 57 .setSuccessCallback(new SuccessCallback<APIBaseInfo>() {
58 @Override 58 @Override
59 public void onSuccess(APIBaseInfo baseInfo) { 59 public void onSuccess(APIBaseInfo baseInfo) {
60 - Log.e(TAG, "onSuccess: ");  
61 -  
62 if (null == getView()) { 60 if (null == getView()) {
63 return; 61 return;
64 } 62 }
@@ -79,7 +77,6 @@ public class UserManagerPresenter extends MvpBasePresenter&lt;UserManagerView&gt; { @@ -79,7 +77,6 @@ public class UserManagerPresenter extends MvpBasePresenter&lt;UserManagerView&gt; {
79 QMUITipDialogUtil.dismessDialog(); 77 QMUITipDialogUtil.dismessDialog();
80 AlertUtil.showDeftToast(context,s); 78 AlertUtil.showDeftToast(context,s);
81 //显示重试 79 //显示重试
82 - Log.e(TAG, "onFailure: " + s);  
83 } 80 }
84 }) 81 })
85 82
@@ -113,8 +110,6 @@ public class UserManagerPresenter extends MvpBasePresenter&lt;UserManagerView&gt; { @@ -113,8 +110,6 @@ public class UserManagerPresenter extends MvpBasePresenter&lt;UserManagerView&gt; {
113 .setSuccessCallback(new SuccessCallback<APIBaseInfo<FamilyRoleBean>>() { 110 .setSuccessCallback(new SuccessCallback<APIBaseInfo<FamilyRoleBean>>() {
114 @Override 111 @Override
115 public void onSuccess(APIBaseInfo<FamilyRoleBean> baseInfo) { 112 public void onSuccess(APIBaseInfo<FamilyRoleBean> baseInfo) {
116 - Log.e(TAG, "onSuccess: ");  
117 -  
118 if (null == getView()) { 113 if (null == getView()) {
119 return; 114 return;
120 } 115 }
@@ -126,8 +121,10 @@ public class UserManagerPresenter extends MvpBasePresenter&lt;UserManagerView&gt; { @@ -126,8 +121,10 @@ public class UserManagerPresenter extends MvpBasePresenter&lt;UserManagerView&gt; {
126 .setFailureCallback(new FailureCallback() { 121 .setFailureCallback(new FailureCallback() {
127 @Override 122 @Override
128 public void onFailure(int i, String s) { 123 public void onFailure(int i, String s) {
  124 + if (null==getView()){
  125 + return;
  126 + }
129 //显示重试 127 //显示重试
130 - Log.e(TAG, "onFailure: " + s);  
131 getView().showRetryView(i, new View.OnClickListener() { 128 getView().showRetryView(i, new View.OnClickListener() {
132 @Override 129 @Override
133 public void onClick(View view) { 130 public void onClick(View view) {
@@ -159,8 +156,6 @@ public class UserManagerPresenter extends MvpBasePresenter&lt;UserManagerView&gt; { @@ -159,8 +156,6 @@ public class UserManagerPresenter extends MvpBasePresenter&lt;UserManagerView&gt; {
159 .setSuccessCallback(new SuccessCallback<APIBaseInfo<RoleNetBean>>() { 156 .setSuccessCallback(new SuccessCallback<APIBaseInfo<RoleNetBean>>() {
160 @Override 157 @Override
161 public void onSuccess(APIBaseInfo<RoleNetBean> baseInfo) { 158 public void onSuccess(APIBaseInfo<RoleNetBean> baseInfo) {
162 - Log.e(TAG, "onSuccess: ");  
163 -  
164 if (null == getView()) { 159 if (null == getView()) {
165 return; 160 return;
166 } 161 }