杨帅 / XiaojiaSoundBox · Commits

Commit f4d3a0b71d893b18f95dd55a0c31e23e949297b4

Authored by YangShuai
1 parent 2095433f

1 修改音箱配网失败逻辑

Inline Side-by-side
Showing 10 changed files with 108 additions and 8 deletions
app/src/main/java/com/cnlive/strike/xiaojiaspeaker/MainActivity.java
  View file @f4d3a0b
... ... @@ -17,6 +17,7 @@ import com.cnlive.strike.xiaojiaspeaker.ui.activity.AllDeviceActivity;
17 17 import com.cnlive.strike.xiaojiaspeaker.ui.activity.BlueToothStep1Activity;
18 18 import com.cnlive.strike.xiaojiaspeaker.ui.activity.BluetoothConnActivity;
19 19 import com.cnlive.strike.xiaojiaspeaker.ui.activity.ConnBluetoothSuccessActivity;
  20 +import com.cnlive.strike.xiaojiaspeaker.ui.activity.ConnFailActivity;
20 21 import com.cnlive.strike.xiaojiaspeaker.ui.activity.DeviceInstructionActivity;
21 22 import com.cnlive.strike.xiaojiaspeaker.ui.activity.DeviceManagerActivity;
22 23 import com.cnlive.strike.xiaojiaspeaker.ui.activity.FirmwareUpdateActivity;
... ... @@ -36,6 +37,7 @@ public class MainActivity extends AppCompatActivity {
36 37 binding = DataBindingUtil.setContentView(this, R.layout.activity_speaker_main);
37 38 XiaoJIaCommInfo.setUserId(this, "10514333".trim());
38 39 XiaoJIaCommInfo.setUserPhone(this, "18301489586".trim());
  40 +
39 41 XiaoJIaCommInfo.setUserIcon(this,"123456");
40 42 XiaoJIaCommInfo.setUserNickName(this,"我的昵称");
41 43 // XiaoJIaCommInfo.setUserId(this, "10535072".trim());
... ... @@ -64,7 +66,6 @@ public class MainActivity extends AppCompatActivity {
64 66 // .withString("currentSelectFamilyId", "")
65 67 // .navigation(this);
66 68  
67   -
68 69 finish();
69 70  
70 71 // View view = LayoutInflater.from(getApplicationContext()).inflate(R.layout.layout_snaker, null);
... ...
config.gradle
  View file @f4d3a0b
... ... @@ -21,7 +21,7 @@ ext {
21 21 //编译方式
22 22 debug : false,
23 23 //版本号
24   - version: "0.2.11",
  24 + version: "0.2.12",
25 25 //Lib库前缀
26 26 packeg : "com.cnlive.module",
27 27 //Lib库名称
... ...
module_xiaojiaSoundBox/src/main/AndroidManifest.xml
  View file @f4d3a0b
... ... @@ -17,9 +17,10 @@
17 17 <uses-permission android:name="android.permission.INTERNET" />
18 18  
19 19 <application>
  20 + <activity android:name=".ui.activity.ConnFailActivity"></activity>
20 21 <activity
21 22 android:name=".ui.activity.RemoteControlActivity"
22   - android:screenOrientation="portrait"></activity>
  23 + android:screenOrientation="portrait" />
23 24 <activity
24 25 android:name=".ui.activity.ShareFriendActivity"
25 26 android:screenOrientation="portrait" />
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/SelectWifiFragmentPresenter.java
  View file @f4d3a0b
... ... @@ -7,6 +7,7 @@ import com.cnlive.libs.base.logic.Logic;
7 7 import com.cnlive.libs.base.logic.callback.DataCallback;
8 8 import com.cnlive.libs.base.logic.callback.FailureCallback;
9 9 import com.cnlive.libs.base.logic.callback.SuccessCallback;
  10 +import com.cnlive.libs.base.util.AlertUtil;
10 11 import com.cnlive.strike.xiaojiaspeaker.frame.view.SelectWifiFragmentView;
11 12 import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
12 13 import com.cnlive.strike.xiaojiaspeaker.netWork.ApiServiceXiaoJia;
... ... @@ -57,9 +58,12 @@ public class SelectWifiFragmentPresenter extends MvpBasePresenter&lt;SelectWifiFrag
57 58 .setFailureCallback(new FailureCallback() {
58 59 @Override
59 60 public void onFailure(int i, String s) {
  61 + if (null==getView()){
  62 + return;
  63 + }
60 64 //显示重试
61   - Log.e(TAG, "onFailure: " + s);
62 65 QMUITipDialogUtil.dismessDialog();
  66 + AlertUtil.showDeftToast(context,s);
63 67 }
64 68 })
65 69  
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SelectWifiFragmentView.java
  View file @f4d3a0b
... ... @@ -25,6 +25,7 @@ import com.cnlive.strike.xiaojiaspeaker.frame.presenter.SelectWifiFragmentPresen
25 25 import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
26 26 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.NetworkResultBean;
27 27 import com.cnlive.strike.xiaojiaspeaker.ui.activity.ConnBluetoothSuccessActivity;
  28 +import com.cnlive.strike.xiaojiaspeaker.ui.activity.ConnFailActivity;
28 29 import com.cnlive.strike.xiaojiaspeaker.ui.adapter.WifiRecycleAdapter;
29 30 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SelectWifiFragment;
30 31 import com.cnlive.strike.xiaojiaspeaker.ui.widget.TipDialog;
... ... @@ -288,15 +289,15 @@ public class SelectWifiFragmentView implements MvpView {
288 289 fragment.getPresenter().queryConfigDeviceNetResult(getContext(), familyId, new SelectWifiFragmentPresenter.OnResponseListener() {
289 290 @Override
290 291 public void onSuccess(NetworkResultBean networkResultBean) {
291   - if (null==getContext()){
  292 + if (null == getContext()) {
292 293 return;
293 294 }
294 295 //判断是否绑定
295   - if (networkResultBean.isIsBinded()&&"success".equals(networkResultBean.getResult().trim())) {
296   - EventBus.getDefault().post(new EventMsg(EventMsg.CLOSE_BLUETOOTH_ACTIVITY,null));
  296 + if (networkResultBean.isIsBinded()) {
  297 + EventBus.getDefault().post(new EventMsg(EventMsg.CLOSE_BLUETOOTH_ACTIVITY, null));
297 298 ConnBluetoothSuccessActivity.startActivity(getContext(), networkResultBean);
298 299 } else {
299   - AlertUtil.showDeftToast(getContext(), "配网失败");
  300 + ConnFailActivity.startActivity(getContext(), networkResultBean.getBindtel());
300 301 }
301 302 }
302 303 });
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ConnFailActivity.java 0 → 100644
  View file @f4d3a0b
  1 +package com.cnlive.strike.xiaojiaspeaker.ui.activity;
  2 +
  3 +import android.app.Activity;
  4 +import android.content.Intent;
  5 +import android.databinding.DataBindingUtil;
  6 +import android.support.v4.content.ContextCompat;
  7 +import android.support.v7.app.AppCompatActivity;
  8 +import android.os.Bundle;
  9 +import android.view.View;
  10 +
  11 +import com.cnlive.libs.base.util.StatusBarUtil;
  12 +import com.cnlive.libs.base.util.StatusBarUtil2;
  13 +import com.cnlive.strike.xiaojiaspeaker.R;
  14 +import com.cnlive.strike.xiaojiaspeaker.databinding.ActivityConnFailBinding;
  15 +
  16 +public class ConnFailActivity extends AppCompatActivity {
  17 + private ActivityConnFailBinding binding;
  18 +
  19 + @Override
  20 + protected void onCreate(Bundle savedInstanceState) {
  21 + super.onCreate(savedInstanceState);
  22 + binding = DataBindingUtil.setContentView(this, R.layout.activity_conn_fail);
  23 + initTopBar();
  24 + if (null != getIntent().getExtras()) {
  25 + String phone = getIntent().getExtras().getString("phone");
  26 + binding.tvTip.setText("该设备已被" + phone + "绑定");
  27 + }
  28 + }
  29 +
  30 + private void initTopBar() {
  31 + StatusBarUtil.setStatusBarWrite(this);
  32 + StatusBarUtil2.setColor(this, ContextCompat.getColor(this, R.color.white), 0);
  33 + if (null != binding) {
  34 + //设置返回按钮
  35 + binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
  36 + @Override
  37 + public void onClick(View view) {
  38 + finish();
  39 + }
  40 + });
  41 + }
  42 + }
  43 +
  44 + public static void startActivity(Activity activity, String phone) {
  45 + Intent intent = new Intent(activity, ConnFailActivity.class);
  46 + intent.putExtra("phone", phone);
  47 + activity.startActivity(intent);
  48 + }
  49 +}
... ...
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_xiaojia_conn_fail.png 0 → 100644
View file @f4d3a0b

3.84 KB
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_xiaojia_conn_fail.png 0 → 100644
View file @f4d3a0b

3.42 KB
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_xiaojia_conn_fail.png 0 → 100644
View file @f4d3a0b

8.82 KB
module_xiaojiaSoundBox/src/main/res/layout/activity_conn_fail.xml 0 → 100644
  View file @f4d3a0b
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<layout>
  3 +
  4 + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  5 + xmlns:app="http://schemas.android.com/apk/res-auto"
  6 + xmlns:tools="http://schemas.android.com/tools"
  7 + android:layout_width="match_parent"
  8 + android:layout_height="match_parent"
  9 + android:orientation="vertical"
  10 + tools:context=".ui.activity.ConnFailActivity">
  11 +
  12 + <com.qmuiteam.qmui.widget.QMUITopBar
  13 + android:id="@+id/topbar"
  14 + android:layout_width="match_parent"
  15 + android:layout_height="?attr/qmui_topbar_height"
  16 + android:background="@color/white" />
  17 +
  18 + <ImageView
  19 + android:layout_width="60dp"
  20 + android:layout_height="60dp"
  21 + android:layout_gravity="center"
  22 + android:layout_marginTop="100dp"
  23 + android:background="@drawable/icon_xiaojia_conn_fail" />
  24 +
  25 + <TextView
  26 + android:layout_width="wrap_content"
  27 + android:layout_height="wrap_content"
  28 + android:layout_gravity="center"
  29 + android:layout_marginTop="30dp"
  30 + android:text="配置失败"
  31 + android:textColor="@color/qmui_config_color_red"
  32 + android:textSize="20sp"
  33 + android:textStyle="bold" />
  34 +
  35 + <TextView
  36 + android:id="@+id/tv_tip"
  37 + android:layout_width="wrap_content"
  38 + android:layout_height="wrap_content"
  39 + android:layout_gravity="center"
  40 + android:layout_marginTop="100dp"
  41 + android:textColor="@color/color_999999"
  42 + android:textSize="15sp" />
  43 + </LinearLayout>
  44 +</layout>
0 45 \ No newline at end of file
... ...