1 新增音箱被他人绑定后拨打电话的功能

YangShuai
1 parent f6ada598
Showing 6 changed files with 77 additions and 7 deletions
config.gradle
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SelectWifiFragmentView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/netWork/bean/NetworkResultBean.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ConnBluetoothSuccessActivity.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ConnFailActivity.java
module_xiaojiaSoundBox/src/main/res/layout/activity_conn_fail.xml
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.2.22",
+            version: "0.2.23",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -218,7 +218,7 @@ public class SelectWifiFragmentView implements MvpView {
             public void onConnectFail(BleDevice bleDevice, BleException exception) {
                 QMUITipDialogUtil.dismessDialog();
                 AlertUtil.showDeftToast(getContext(), "连接无响应，请稍后重试");
-                EventBus.getDefault().post(new EventMsg(EventMsg.DEVICE_NOT_RESPONSE,""));
+                EventBus.getDefault().post(new EventMsg(EventMsg.DEVICE_NOT_RESPONSE, ""));
             }
  
             // 连接成功，BleDevice即为所连接的BLE设备
@@ -273,7 +273,7 @@ public class SelectWifiFragmentView implements MvpView {
                                 try {
                                     String result = new String(data, "UTF-8");
                                     Log.e(TAG, "onCharacteristicChanged: " + result);
-                                    if (result.indexOf(BlufiConstants.BIND_SUCCESS) != -1||result.indexOf(BlufiConstants.BIND_FAIL) != -1) {
+                                    if (result.indexOf(BlufiConstants.BIND_SUCCESS) != -1 || result.indexOf(BlufiConstants.BIND_FAIL) != -1) {
                                         isSetNetSuccess = true;
                                         BleManager.getInstance().stopNotify(bleDevice, BlufiConstants.UUID_WIFI_SERVICE.toString(), BlufiConstants.UUID_NOTIFY_CHARACTERISTIC.toString());
                                         BleManager.getInstance().disconnect(bleDevice);
@@ -296,7 +296,11 @@ public class SelectWifiFragmentView implements MvpView {
                                                             EventBus.getDefault().post(new EventMsg(EventMsg.CLOSE_BLUETOOTH_ACTIVITY, null));
                                                             ConnBluetoothSuccessActivity.startActivity(getContext(), networkResultBean);
                                                         } else {
-                                                            ConnFailActivity.startActivity(getContext(), networkResultBean.getBindtel());
+                                                            if (!TextUtils.isEmpty(networkResultBean.getPhone())) {
+                                                                ConnFailActivity.startActivity(getContext(), networkResultBean.getPhone());
+                                                            }else {
+                                                                ConnFailActivity.startActivity(getContext(), networkResultBean.getBindtel());
+                                                            }
                                                         }
                                                     }
                                                 });
@@ -28,6 +28,15 @@ public class NetworkResultBean implements Serializable {
     private boolean isFirstBinded;
     private boolean isBinded;
     private String bindtel;
+    private String phone;
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
  
     public String getMainctl() {
         return mainctl;
@@ -92,7 +92,7 @@ public class ConnBluetoothSuccessActivity extends AppCompatActivity {
         binding.btnInvitFriend.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                SelectIMFriendActivity.startActivity(ConnBluetoothSuccessActivity.this, XiaoJIaCommInfo.getFamilyId(ConnBluetoothSuccessActivity.this));
+                UserManagerActivity.StartActivity(ConnBluetoothSuccessActivity.this, XiaoJIaCommInfo.getFamilyId(ConnBluetoothSuccessActivity.this));
             }
         });
         //修改音箱名称
@@ -3,9 +3,11 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
 import android.app.Activity;
 import android.content.Intent;
 import android.databinding.DataBindingUtil;
+import android.net.Uri;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
  
 import com.cnlive.libs.base.util.StatusBarUtil;
@@ -15,16 +17,30 @@ import com.cnlive.strike.xiaojiaspeaker.databinding.ActivityConnFailBinding;
  
 public class ConnFailActivity extends AppCompatActivity {
     private ActivityConnFailBinding binding;
+    private String phone;
  
     @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");
+            phone = getIntent().getExtras().getString("phone");
+        }
+        if (!TextUtils.isEmpty(phone)) {
             binding.tvTip.setText("该设备已被" + phone + "绑定");
         }
+        if (phone.indexOf("X") != -1 || phone.indexOf("x") != -1 || phone.indexOf("*") != -1) {
+            binding.llCallView.setVisibility(View.GONE);
+        } else {
+            binding.llCallView.setVisibility(View.VISIBLE);
+        }
+        binding.btnCall.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                call(phone);
+            }
+        });
+        initTopBar();
     }
  
     private void initTopBar() {
@@ -46,4 +62,15 @@ public class ConnFailActivity extends AppCompatActivity {
         intent.putExtra("phone", phone);
         activity.startActivity(intent);
     }
+
+    /**
+     * 调用拨号界面
+     *
+     * @param phone 电话号码
+     */
+    private void call(String phone) {
+        Intent intent = new Intent(Intent.ACTION_DIAL, Uri.parse("tel:" + phone));
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        startActivity(intent);
+    }
 }
@@ -40,5 +40,35 @@
             android:layout_marginTop="100dp"
             android:textColor="@color/color_999999"
             android:textSize="15sp" />
+
+        <LinearLayout
+            android:id="@+id/ll_call_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:visibility="gone"
+            >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="20dp"
+                android:text="请联系对方删除此设备或添加你为音箱“使用者”"
+                android:textColor="@color/color_999999"
+                android:textSize="15sp" />
+
+            <Button
+                android:id="@+id/btn_call"
+                android:layout_width="100dp"
+                android:layout_height="35dp"
+                android:layout_marginTop="30dp"
+                android:background="@drawable/selector_xiaojia_btn_green"
+                android:text="联系"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:textStyle="bold" />
+        </LinearLayout>
     </LinearLayout>
 </layout>
 \ No newline at end of file