1 根据用户权限,调整设备管理页

YangShuai
1 parent ccae0316
Showing 4 changed files with 40 additions and 12 deletions
app/src/main/java/com/cnlive/strike/xiaojiaspeaker/MainActivity.java
config.gradle
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/DeviceManagerFragmentView.java
module_xiaojiaSoundBox/src/main/res/values/strings.xml
@@ -27,8 +27,12 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_speaker_main);
-        XiaoJIaCommInfo.setUserId(this, "10514333".trim());
-        XiaoJIaCommInfo.setUserPhone(this, "18301489586".trim());
+//        XiaoJIaCommInfo.setUserId(this, "10514333".trim());
+//        XiaoJIaCommInfo.setUserPhone(this, "18301489586".trim());
+
+        XiaoJIaCommInfo.setUserId(this, "10535072".trim());
+        XiaoJIaCommInfo.setUserPhone(this, "15532913679".trim());
+
 //        XiaoJIaCommInfo.setUserId(this, "10513196");
 //        XiaoJIaCommInfo.setUserPhone(this, "15010140838");
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.1.8",
+            version: "0.1.9",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -9,6 +9,7 @@ import android.net.Uri;
 import android.provider.Settings;
 import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.DefaultItemAnimator;
 import android.support.v7.widget.LinearLayoutManager;
 import android.text.TextUtils;
@@ -16,6 +17,7 @@ import android.util.Log;
 import android.view.View;
 import com.clj.fastble.BleManager;
+import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.strike.xiaojiaspeaker.R;
 import com.cnlive.strike.xiaojiaspeaker.model.DeviceManagerMenu;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.DeviceDetail;
@@ -76,27 +78,44 @@ public class DeviceManagerFragmentView implements MvpView {
 //        fragment.binding.rvMenu.setAdapter(adapter);
 //        ((DefaultItemAnimator) fragment.binding.rvMenu.getItemAnimator()).setSupportsChangeAnimations(false);
+        if (currentUser.getIsMaster()==FamilyListBean.THE_HOST){
+            //显示删除
+            fragment.binding.tvDeleteDevice.setVisibility(View.VISIBLE);
+        }else {
+            //隐藏删除
+            fragment.binding.tvDeleteDevice.setVisibility(View.GONE);
+        }
         //音箱名称
         fragment.binding.llDeviceName.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                ChangeDeviceNameActivity.startActivity(getContext(), currentDeviceInfo.getMcid());
+                if (currentUser.getIsMaster()==FamilyListBean.THE_HOST){
+                    ChangeDeviceNameActivity.startActivity(getContext(), currentDeviceInfo.getMcid());
+                }else {
+                    AlertUtil.showDeftToast(getContext(), getContext().getResources().getString(R.string.change_device_no_pression_tip));
+                }
             }
         });
         //wifi设置
         fragment.binding.llWifiSetting.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                //判断GPS是否打开
-                boolean isOpenGPS = CheckUtil.isOPenGps(getContext());
-                if (!isOpenGPS) {
-                    CheckUtil.openGPS(getContext());
-                } else {
-                    //判断蓝牙是否打开
-                    getPermissionsWithTip();
+                if (currentUser.getIsMaster()==FamilyListBean.THE_HOST){
+                    //判断GPS是否打开
+                    boolean isOpenGPS = CheckUtil.isOPenGps(getContext());
+                    if (!isOpenGPS) {
+                        CheckUtil.openGPS(getContext());
+                    } else {
+                        //判断蓝牙是否打开
+                        getPermissionsWithTip();
+                    }
+                }else {
+                    AlertUtil.showDeftToast(getContext(), getContext().getResources().getString(R.string.change_device_no_pression_tip));
                 }
+
+
             }
         });
         //设备信息
@@ -110,7 +129,11 @@ public class DeviceManagerFragmentView implements MvpView {
         fragment.binding.llDeviceUpdate.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                FirmwareUpdateActivity.startActivity(getContext(), deviceDetail);
+                if (currentUser.getIsMaster()==FamilyListBean.THE_HOST){
+                    FirmwareUpdateActivity.startActivity(getContext(), deviceDetail);
+                }else {
+                    AlertUtil.showDeftToast(getContext(), getContext().getResources().getString(R.string.change_device_no_pression_tip));
+                }
             }
         });
         //删除设备
@@ -29,4 +29,5 @@
     <string name="haseapp_login">已安装网家家，请直接登录扫码</string>
     <string name="save_bitmap_app_scan">-保存图片用网家家扫码-</string>
     <string name="share_family">分享给家人</string>
+    <string name="change_device_no_pression_tip">您无修改权限</string>
 </resources>