1 根据产品需求修改UI及逻辑

YangShuai
1 parent 6e7166fc
Showing 6 changed files with 75 additions and 32 deletions
config.gradle
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/DeviceManagerFragmentView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/InvitFriendView.java
module_xiaojiaSoundBox/src/main/res/layout/activity_blue_tooth_step2.xml
module_xiaojiaSoundBox/src/main/res/layout/fragment_device_manager.xml
module_xiaojiaSoundBox/src/main/res/layout/fragment_invit_friend.xml
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.2.25",
+            version: "0.2.26",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -80,10 +80,10 @@ public class DeviceManagerFragmentView implements MvpView {
  
         if (currentUser.getIsMaster()==FamilyListBean.THE_HOST){
             //显示删除
-            fragment.binding.tvDeleteDevice.setVisibility(View.VISIBLE);
+            fragment.binding.llDeleteView.setVisibility(View.VISIBLE);
         }else {
             //隐藏删除
-            fragment.binding.tvDeleteDevice.setVisibility(View.GONE);
+            fragment.binding.llDeleteView.setVisibility(View.GONE);
         }
  
         //音箱名称
@@ -3,7 +3,7 @@ package com.cnlive.strike.xiaojiaspeaker.frame.view;
 import android.app.Activity;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.net.Uri;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.LinearLayoutManager;
 import android.text.TextUtils;
 import android.view.View;
@@ -18,13 +18,10 @@ import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
 import com.cnlive.strike.xiaojiaspeaker.constants.XiaoJiaConst;
 import com.cnlive.strike.xiaojiaspeaker.model.RoleInfo;
 import com.cnlive.strike.xiaojiaspeaker.model.XiaoJiaQrcode;
-import com.cnlive.strike.xiaojiaspeaker.netWork.bean.FamilyRoleBean;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.RoleNetBean;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.ShareFriendActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.adapter.SetRoleAdapter;
 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.InvitFriendFragment;
-import com.cnlive.strike.xiaojiaspeaker.ui.widget.EditRoleDialog;
-import com.cnlive.strike.xiaojiaspeaker.ui.widget.SelectDialog;
 import com.cnlive.strike.xiaojiaspeaker.util.CommonUtils;
 import com.cnlive.strike.xiaojiaspeaker.util.DensityUtil;
 import com.cnlive.strike.xiaojiaspeaker.util.GsonUtil;
@@ -56,8 +53,13 @@ public class InvitFriendView implements MvpView {
     }
  
     public void initView() {
+        setShareCantClick();
         this.currentSelectFamilyId = currentSelectFamilyId;
         fragment.binding.btnShare.setOnClickListener(v -> {
+            if ("0".equals(fragment.binding.btnShare.getTag().toString())) {
+                AlertUtil.showDeftToast(getContext(), "请选择角色");
+                return;
+            }
             if (!TextUtils.isEmpty(encryptionContent)) {
                 ShareFriendActivity.startActivity(fragment.getActivity(), XiaoJIaCommInfo.getUserIcon(getContext()), XiaoJIaCommInfo.getUserNickName(getContext()), encryptionContent);
             } else {
@@ -102,11 +104,13 @@ public class InvitFriendView implements MvpView {
             public void onSelect(int roleId) {
                 fragment.binding.llNoQrcode.setVisibility(View.GONE);
                 createQrcode(roleId);
+                setShareClick();
             }
  
             @Override
             public void onCancel() {
                 fragment.binding.llNoQrcode.setVisibility(View.VISIBLE);
+                setShareCantClick();
             }
         });
     }
@@ -191,4 +195,27 @@ public class InvitFriendView implements MvpView {
         }
         fragment.binding.emptyLayout.show(false, titleText, detailText, getContext().getString(R.string.retry), R.drawable.wufalianjie, listener);
     }
+
+    /**
+     * 设置绑定按钮不可点击
+     */
+    private void setShareCantClick() {
+        if (null == getContext()) {
+            return;
+        }
+        fragment.binding.btnShare.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.shape_xiaojia_btn_press));
+        fragment.binding.btnShare.setTag("0");
+
+    }
+
+    /**
+     * 设置绑定按钮可点击
+     */
+    private void setShareClick() {
+        if (null == getContext()) {
+            return;
+        }
+        fragment.binding.btnShare.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.selector_xiaojia_btn_green));
+        fragment.binding.btnShare.setTag("1");
+    }
 }
@@ -69,7 +69,7 @@
                 android:layout_marginTop="20dp"
                 android:id="@+id/tv_previous_step"
                 android:text="@string/previous_step_u"
-                android:textColor="@color/color_999999"
+                android:textColor="@color/color_23D41E"
                 android:textSize="15sp" />
  
             <LinearLayout
@@ -47,17 +47,17 @@
  
         <!--    </LinearLayout>-->
  
-        <FrameLayout
+
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:background="@color/color_F2F2F2"
+            android:orientation="vertical"
+            tools:context=".ui.activity.SearchDeviceActivity">
  
-            <RelativeLayout
+            <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/color_F2F2F2"
-                android:orientation="vertical"
-                tools:context=".ui.activity.SearchDeviceActivity">
-
+                android:layout_height="match_parent">
  
                 <ScrollView
                     android:layout_width="match_parent"
@@ -298,30 +298,45 @@
                     </LinearLayout>
                 </ScrollView>
  
+                <com.cnlive.strike.ui.widget.UIEmptyView
+                    android:id="@+id/empty_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@color/color_fff"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:visibility="gone" />
+            </FrameLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_delete_view"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:orientation="vertical">
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/line" />
+
                 <TextView
                     android:id="@+id/tv_delete_device"
                     android:layout_width="match_parent"
                     android:layout_height="60dp"
-                    android:layout_alignParentBottom="true"
                     android:background="@drawable/selectable_xiaojia_item_white"
                     android:clickable="true"
                     android:gravity="center"
                     android:text="删除设备"
                     android:textColor="@color/color_EB3D3F"
                     android:textSize="15sp" />
-                <!--        <RelativeLayout-->
-                <!--            android:id="@+id/fragment_container"-->
-                <!--            android:layout_width="match_parent"-->
-                <!--            android:layout_height="match_parent"></RelativeLayout>-->
-            </RelativeLayout>
-
-            <com.cnlive.strike.ui.widget.UIEmptyView
-                android:id="@+id/empty_layout"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/color_fff"
-                android:visibility="gone" />
-        </FrameLayout>
+            </LinearLayout>
+            <!--        <RelativeLayout-->
+            <!--            android:id="@+id/fragment_container"-->
+            <!--            android:layout_width="match_parent"-->
+            <!--            android:layout_height="match_parent"></RelativeLayout>-->
+        </RelativeLayout>
+
  
     </LinearLayout>
 </layout>
 \ No newline at end of file
@@ -192,10 +192,11 @@
                             android:layout_marginLeft="20dp"
                             android:layout_marginTop="30dp"
                             android:layout_marginRight="20dp"
-                            android:background="@drawable/selector_xiaojia_btn_green"
-                            android:text="保存并分享给家人"
+                            android:background="@drawable/shape_xiaojia_btn_gray"
+                            android:text="生成二维码海报"
                             android:textColor="@color/white"
                             android:textSize="16sp"
+                            android:tag="0"
                             android:textStyle="bold" />
                     </LinearLayout>
                 </LinearLayout>