1 修改音箱配网失败逻辑

YangShuai
1 parent 2095433f
Showing 10 changed files with 108 additions and 8 deletions
app/src/main/java/com/cnlive/strike/xiaojiaspeaker/MainActivity.java
config.gradle
module_xiaojiaSoundBox/src/main/AndroidManifest.xml
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/SelectWifiFragmentPresenter.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SelectWifiFragmentView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ConnFailActivity.java
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_xiaojia_conn_fail.png
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_xiaojia_conn_fail.png
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_xiaojia_conn_fail.png
module_xiaojiaSoundBox/src/main/res/layout/activity_conn_fail.xml
@@ -17,6 +17,7 @@ import com.cnlive.strike.xiaojiaspeaker.ui.activity.AllDeviceActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.BlueToothStep1Activity;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.BluetoothConnActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.ConnBluetoothSuccessActivity;
+import com.cnlive.strike.xiaojiaspeaker.ui.activity.ConnFailActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.DeviceInstructionActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.DeviceManagerActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.FirmwareUpdateActivity;
@@ -36,6 +37,7 @@ public class MainActivity extends AppCompatActivity {
         binding = DataBindingUtil.setContentView(this, R.layout.activity_speaker_main);
         XiaoJIaCommInfo.setUserId(this, "10514333".trim());
         XiaoJIaCommInfo.setUserPhone(this, "18301489586".trim());
+
         XiaoJIaCommInfo.setUserIcon(this,"123456");
         XiaoJIaCommInfo.setUserNickName(this,"我的昵称");
 //        XiaoJIaCommInfo.setUserId(this, "10535072".trim());
@@ -64,7 +66,6 @@ public class MainActivity extends AppCompatActivity {
 //                .withString("currentSelectFamilyId", "")
 //                .navigation(this);
-
         finish();
 //        View view = LayoutInflater.from(getApplicationContext()).inflate(R.layout.layout_snaker, null);
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.2.11",
+            version: "0.2.12",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -17,9 +17,10 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <application>
+        <activity android:name=".ui.activity.ConnFailActivity"></activity>
         <activity
             android:name=".ui.activity.RemoteControlActivity"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.activity.ShareFriendActivity"
             android:screenOrientation="portrait" />
@@ -7,6 +7,7 @@ import com.cnlive.libs.base.logic.Logic;
 import com.cnlive.libs.base.logic.callback.DataCallback;
 import com.cnlive.libs.base.logic.callback.FailureCallback;
 import com.cnlive.libs.base.logic.callback.SuccessCallback;
+import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.strike.xiaojiaspeaker.frame.view.SelectWifiFragmentView;
 import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
 import com.cnlive.strike.xiaojiaspeaker.netWork.ApiServiceXiaoJia;
@@ -57,9 +58,12 @@ public class SelectWifiFragmentPresenter extends MvpBasePresenter&lt;SelectWifiFrag
                 .setFailureCallback(new FailureCallback() {
                     @Override
                     public void onFailure(int i, String s) {
+                        if (null==getView()){
+                            return;
+                        }
                         //显示重试
-                        Log.e(TAG, "onFailure: " + s);
                         QMUITipDialogUtil.dismessDialog();
+                        AlertUtil.showDeftToast(context,s);
                     }
                 })
@@ -25,6 +25,7 @@ import com.cnlive.strike.xiaojiaspeaker.frame.presenter.SelectWifiFragmentPresen
 import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.NetworkResultBean;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.ConnBluetoothSuccessActivity;
+import com.cnlive.strike.xiaojiaspeaker.ui.activity.ConnFailActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.adapter.WifiRecycleAdapter;
 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SelectWifiFragment;
 import com.cnlive.strike.xiaojiaspeaker.ui.widget.TipDialog;
@@ -288,15 +289,15 @@ public class SelectWifiFragmentView implements MvpView {
                                                 fragment.getPresenter().queryConfigDeviceNetResult(getContext(), familyId, new SelectWifiFragmentPresenter.OnResponseListener() {
                                                     @Override
                                                     public void onSuccess(NetworkResultBean networkResultBean) {
-                                                        if (null==getContext()){
+                                                        if (null == getContext()) {
                                                             return;
                                                         }
                                                         //判断是否绑定
-                                                        if (networkResultBean.isIsBinded()&&"success".equals(networkResultBean.getResult().trim())) {
-                                                            EventBus.getDefault().post(new EventMsg(EventMsg.CLOSE_BLUETOOTH_ACTIVITY,null));
+                                                        if (networkResultBean.isIsBinded()) {
+                                                            EventBus.getDefault().post(new EventMsg(EventMsg.CLOSE_BLUETOOTH_ACTIVITY, null));
                                                             ConnBluetoothSuccessActivity.startActivity(getContext(), networkResultBean);
                                                         } else {
-                                                            AlertUtil.showDeftToast(getContext(), "配网失败");
+                                                            ConnFailActivity.startActivity(getContext(), networkResultBean.getBindtel());
                                                         }
                                                     }
                                                 });
+package com.cnlive.strike.xiaojiaspeaker.ui.activity;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+
+import com.cnlive.libs.base.util.StatusBarUtil;
+import com.cnlive.libs.base.util.StatusBarUtil2;
+import com.cnlive.strike.xiaojiaspeaker.R;
+import com.cnlive.strike.xiaojiaspeaker.databinding.ActivityConnFailBinding;
+
+public class ConnFailActivity extends AppCompatActivity {
+    private ActivityConnFailBinding binding;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_conn_fail);
+        initTopBar();
+        if (null != getIntent().getExtras()) {
+            String phone = getIntent().getExtras().getString("phone");
+            binding.tvTip.setText("该设备已被" + phone + "绑定");
+        }
+    }
+
+    private void initTopBar() {
+        StatusBarUtil.setStatusBarWrite(this);
+        StatusBarUtil2.setColor(this, ContextCompat.getColor(this, R.color.white), 0);
+        if (null != binding) {
+            //设置返回按钮
+            binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    finish();
+                }
+            });
+        }
+    }
+
+    public static void startActivity(Activity activity, String phone) {
+        Intent intent = new Intent(activity, ConnFailActivity.class);
+        intent.putExtra("phone", phone);
+        activity.startActivity(intent);
+    }
+}
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        tools:context=".ui.activity.ConnFailActivity">
+
+        <com.qmuiteam.qmui.widget.QMUITopBar
+            android:id="@+id/topbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/qmui_topbar_height"
+            android:background="@color/white" />
+
+        <ImageView
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="100dp"
+            android:background="@drawable/icon_xiaojia_conn_fail" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="30dp"
+            android:text="配置失败"
+            android:textColor="@color/qmui_config_color_red"
+            android:textSize="20sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/tv_tip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="100dp"
+            android:textColor="@color/color_999999"
+            android:textSize="15sp" />
+    </LinearLayout>
+</layout>
 \ No newline at end of file