1 修改使用者管理UI

2 完成二维码分享

1 修改使用者管理UI
2 完成二维码分享
YangShuai
1 parent 185c3c8f
Showing 15 changed files with 149 additions and 19 deletions
app/src/main/java/com/cnlive/strike/xiaojiaspeaker/MainActivity.java
module_xiaojiaSoundBox/src/main/AndroidManifest.xml
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/commonInfo/XiaoJIaCommInfo.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/SelectIMFriendPresenter.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/InvitFriendView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SelectIMFriendView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/UserManagerView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/netWork/ApiServiceXiaoJia.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/SelectIMFriendActivity.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/adapter/SelectIMFriendAdapter.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/InvitFriendFragment.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SelectIMFriendFragment.java
module_xiaojiaSoundBox/src/main/res/layout/fragment_device_detail.xml
module_xiaojiaSoundBox/src/main/res/layout/item_list_user_host.xml
module_xiaojiaSoundBox/src/main/res/layout/item_list_user_member.xml
@@ -35,12 +35,12 @@ public class MainActivity extends AppCompatActivity {
 //        startActivity(new Intent(MainActivity.this, BluetoothConnActivity.class));
 //        startActivity(new Intent(MainActivity.this, BlueToothStep1Activity.class));
 //            startActivity(new Intent(MainActivity.this, ConnBluetoothSuccessActivity.class));
-//        startActivity(new Intent(MainActivity.this, AllDeviceActivity.class));
+        startActivity(new Intent(MainActivity.this, AllDeviceActivity.class));
 //        startActivity(new Intent(MainActivity.this, DeviceInstructionActivity.class));
 //        startActivity(new Intent(MainActivity.this, DeviceManagerActivity.class));
 //        startActivity(new Intent(MainActivity.this, FirmwareUpdateActivity.class));
 //                startActivity(new Intent(MainActivity.this, SelectWifiActivity.class));
-        startActivity(new Intent(MainActivity.this, ToolBarTestActivity.class));
+//        startActivity(new Intent(MainActivity.this, ToolBarTestActivity.class));
 //        startActivity(new Intent(MainActivity.this, SelectIMFriendActivity.class));
 //        startActivity(new Intent(MainActivity.this, InvitFriendActivity.class));
@@ -20,7 +20,6 @@
         <activity android:name=".ui.activity.ShareFriendActivity"/>
         <activity android:name=".ui.activity.InvitFriendActivity" />
         <activity android:name=".ui.activity.DeviceInfoActivity"></activity>
-        <activity android:name=".ui.activity.InvitFriendActivity" />
         <activity android:name=".ui.activity.UserManagerActivity" />
         <activity android:name=".ui.activity.ChangeDeviceNameActivity" />
         <activity android:name=".ui.activity.DeviceDetailActivity" />
@@ -24,9 +24,29 @@ public class XiaoJIaCommInfo {
     private static final String KEY_CMCC_ID = "xiaojia_cmcc_id";
     //用户手机号
     private static final String KEY_USER_PHONE = "xiaojia_user_phone";
+    //    用户头像
+    private static final String KEY_USER_ICON = "xiaojia_user_icon";
+    //    用户昵称
+    private static final String KEY_USER_NICK_NAME = "xiaojia_user_nick";
     private static final int MyCurrentMode = Context.MODE_MULTI_PROCESS;
+    public static void setUserNickName(Context context, String userIcon) {
+        MySpHelper.getInstance(context, MyCurrentMode).putString(KEY_USER_NICK_NAME, userIcon);
+    }
+
+    public static String getUserNickName(Context context) {
+        return MySpHelper.getInstance(context, MyCurrentMode).getString(KEY_USER_NICK_NAME, "");
+    }
+
+    public static void setUserIcon(Context context, String userIcon) {
+        MySpHelper.getInstance(context, MyCurrentMode).putString(KEY_USER_ICON, userIcon);
+    }
+
+    public static String getUserIcon(Context context) {
+        return MySpHelper.getInstance(context, MyCurrentMode).getString(KEY_USER_ICON, "");
+    }
+
     public static void setUserPhone(Context context, String userPhone) {
         MySpHelper.getInstance(context, MyCurrentMode).putString(KEY_USER_PHONE, userPhone);
     }
 package com.cnlive.strike.xiaojiaspeaker.frame.presenter;
+import android.content.Context;
+import android.util.Log;
+import android.view.View;
+
+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.strike.xiaojiaspeaker.frame.view.SelectIMFriendView;
+import com.cnlive.strike.xiaojiaspeaker.netWork.ApiServiceXiaoJia;
+import com.cnlive.strike.xiaojiaspeaker.netWork.bean.APIBaseInfo;
+import com.cnlive.strike.xiaojiaspeaker.netWork.bean.RoleNetBean;
+import com.cnlive.strike.xiaojiaspeaker.netWork.bean.XiaoJiaContactInfo;
+import com.cnlive.strike.xiaojiaspeaker.netWork.result.SubscriptionRequest;
 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
+import java.util.HashMap;
+import java.util.Map;
+
+import io.reactivex.disposables.Disposable;
+
 public class SelectIMFriendPresenter extends MvpBasePresenter<SelectIMFriendView> {
+
+    private String TAG = "SelectIMFriendPresenter";
+
+    public void getFamilyMember(Context context, String familyId) {
+        if (null == getView()) {
+            return;
+        }
+        Map<String, String> map = new HashMap<>();
+        map.put("familyId", familyId);
+        Logic.create(map)
+                .action(new Logic.Action<Map<String, String>, APIBaseInfo<XiaoJiaContactInfo>>() {
+                    @Override
+                    public Disposable action(Map<String, String> paramsMap, DataCallback<APIBaseInfo<XiaoJiaContactInfo>> dataCallback) {
+                        return SubscriptionRequest.service(ApiServiceXiaoJia.class, api -> api.getFamilyMember(paramsMap)).subscribe(context, dataCallback);
+                    }
+                }).<APIBaseInfo<XiaoJiaContactInfo>>event()
+                .setSuccessCallback(new SuccessCallback<APIBaseInfo<XiaoJiaContactInfo>>() {
+                    @Override
+                    public void onSuccess(APIBaseInfo<XiaoJiaContactInfo> baseInfo) {
+                        Log.e(TAG, "onSuccess: ");
+
+                        if (null == getView()) {
+                            return;
+                        }
+
+                    }
+                })
+                .setFailureCallback(new FailureCallback() {
+                    @Override
+                    public void onFailure(int i, String s) {
+                        //显示重试
+                        Log.e(TAG, "onFailure: " + s);
+//                        getView().showRetryView(i, new View.OnClickListener() {
+//                            @Override
+//                            public void onClick(View view) {
+//                                getSetRoleList(context, sids, familyId);
+//                            }
+//                        });
+                    }
+                })
+
+                .start();
+    }
 }
@@ -10,6 +10,7 @@ import android.view.View;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cnlive.libs.base.arouter.QrService;
+import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.libs.base.util.SimpleDES;
 import com.cnlive.strike.application.GlideApp;
 import com.cnlive.strike.xiaojiaspeaker.R;
@@ -42,6 +43,10 @@ public class InvitFriendView implements MvpView {
     private String encryptionContent;
     private String currentSelectFamilyId;
+    public void setCurrentSelectFamilyId(String currentSelectFamilyId) {
+        this.currentSelectFamilyId = currentSelectFamilyId;
+    }
+
     public InvitFriendView(InvitFriendFragment fragment) {
         this.fragment = fragment;
     }
@@ -50,13 +55,14 @@ public class InvitFriendView implements MvpView {
         return fragment == null ? null : fragment.getActivity();
     }
-    public void initView(String currentSelectFamilyId) {
+    public void initView() {
         this.currentSelectFamilyId = currentSelectFamilyId;
         fragment.binding.btnShare.setOnClickListener(v -> {
             if (!TextUtils.isEmpty(encryptionContent)) {
-                ShareFriendActivity.startActivity(fragment.getActivity(), "", "", encryptionContent);
+                ShareFriendActivity.startActivity(fragment.getActivity(), XiaoJIaCommInfo.getUserIcon(getContext()), XiaoJIaCommInfo.getUserNickName(getContext()), encryptionContent);
             } else {
                 //提示跳转失败原因
+                AlertUtil.showDeftToast(getContext(), "参数异常");
             }
         });
     }
@@ -113,7 +119,7 @@ public class InvitFriendView implements MvpView {
             xiaoJiaQrcode.setRoleId(roleId);
             xiaoJiaQrcode.setUuid(CommonUtils.getUUID());
-            jsonObject.put("content", GsonUtil.GsonString(xiaoJiaQrcode));
+            jsonObject.put("xiajiaContent", GsonUtil.GsonString(xiaoJiaQrcode));
             jsonObject.put("time", System.currentTimeMillis());
             jsonObject.put("type", XiaoJiaConst.QRCODE_TYPE);
@@ -33,6 +33,7 @@ public class SelectIMFriendView implements MvpView, LetterBarView.OnLetterSelect
     private List<IMFriendNoLetterInfo> noLetterInfoList;
     private List<IMFriendHasLetterInfo> imFriendInfoList;
     private LinearLayoutManager linearLayoutManager;
+    private String currentSelectFamilyId;
     private String TAG = "SelectIMFriendView";
     private boolean isFirst = true;
@@ -243,9 +244,9 @@ public class SelectIMFriendView implements MvpView, LetterBarView.OnLetterSelect
             @Override
             public void onClick(View view) {
                 //获取选择的uid
-                if (null!=adapter){
-                    String selectUids=adapter.getSelectUid();
-                    SetFriendsRoleActivity.startActivity(getContext(),selectUids);
+                if (null != adapter) {
+                    String selectUids = adapter.getSelectUid();
+                    SetFriendsRoleActivity.startActivity(getContext(), selectUids);
                 }
             }
@@ -172,7 +172,7 @@ public class UserManagerView implements MvpView {
         fragment.binding.btnInvitFriend.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                SelectIMFriendActivity.startActivity(getContext());
+                SelectIMFriendActivity.startActivity(getContext(), currentSelectFamilyId);
             }
         });
         //二维码点击
@@ -355,7 +355,9 @@ public class UserManagerView implements MvpView {
         mPopMenu.setmItemClickListener(new PopMenu.OnItemClickListener() {
             @Override
             public void onClick(int position, PopMenuInfo popMenuInfo) {
-                if (position == 1) {
+                if (position == 0) {
+                    SelectIMFriendActivity.startActivity(getContext(), currentSelectFamilyId);
+                } else if (position == 1) {
                     InvitFriendActivity.startActivity(getContext(), currentSelectFamilyId);
                 }
             }
@@ -7,6 +7,7 @@ import com.cnlive.strike.xiaojiaspeaker.netWork.bean.FamilyRoleBean;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.NetworkResultBean;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.RoleNetBean;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.APIBaseInfo;
+import com.cnlive.strike.xiaojiaspeaker.netWork.bean.XiaoJiaContactInfo;
 import java.util.Map;
@@ -112,5 +113,15 @@ public interface ApiServiceXiaoJia {
      */
     @POST("/Daren/sound/changeWiFi.action")
     Observable<Result<APIBaseInfo>> changeWiFi(@QueryMap() Map<String, String> maps);
+
+    /**
+     * 获取家庭成员列表(用于校验通讯录)
+     * familyId	String	true	家庭id
+     *
+     * @param maps
+     * @return
+     */
+    @GET("/Daren/sound/getFamilyMember.action")
+    Observable<Result<APIBaseInfo<XiaoJiaContactInfo>>> getFamilyMember(@QueryMap() Map<String, String> maps);
 }
@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.text.TextUtils;
 import com.cnlive.strike.xiaojiaspeaker.R;
 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SearchDevicefragment;
@@ -15,12 +16,18 @@ public class SelectIMFriendActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_select_imfriend);
-        getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, SelectIMFriendFragment.newInstance()).commit();
+        if (null != getIntent().getExtras()) {
+            String currentSelectFamilyId = getIntent().getExtras().getString("currentSelectFamilyId");
+            if (!TextUtils.isEmpty(currentSelectFamilyId)) {
+                getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, SelectIMFriendFragment.newInstance(currentSelectFamilyId)).commit();
+            }
+        }
     }
-    public static void startActivity(Activity activity) {
+    public static void startActivity(Activity activity, String currentSelectFamilyId) {
         Intent intent = new Intent(activity, SelectIMFriendActivity.class);
+        intent.putExtra("currentSelectFamilyId", currentSelectFamilyId);
         activity.startActivity(intent);
     }
 }
@@ -28,7 +28,8 @@ public class SelectIMFriendAdapter extends RecyclerView.Adapter {
     private HashMap<String, Integer> contactLetterGuideMap;
     private List<IMFriendHasLetterInfo> rawDataList;
     private OnItemCheckBoxListener onItemCheckBoxListener;
-    private final int MAX_FRIENDS = 10;//最多10个人
+    private  int MAX_FRIENDS = 10;//最多10个人
+
     private String TAG = "SelectIMFriendAdapter";
     public void setOnItemCheckBoxListener(OnItemCheckBoxListener onItemCheckBoxListener) {
@@ -63,7 +64,13 @@ public class SelectIMFriendAdapter extends RecyclerView.Adapter {
             if (imFriendInfoList.get(i).getType() == IMFriendHasLetterInfo.LETTER_INDEX) {
                 contactLetterGuideMap.put(imFriendInfoList.get(i).getLetter(), i);
             }
+            //不可选
+            if (imFriendInfoList.get(i).isCantSelect()){
+                //获取默认不可选的人
+                MAX_FRIENDS--;
+            }
         }
+
     }
     public void searchItems(List<IMFriendHasLetterInfo> list) {
@@ -40,7 +40,8 @@ public class InvitFriendFragment extends MvpBindingFragment&lt;InvitFriendView, Inv
             if (null != getArguments()) {
                 String currentSelectFamilyId = getArguments().getString("currentSelectFamilyId");
                 if (!TextUtils.isEmpty(currentSelectFamilyId)) {
-                    getMvpView().initView(currentSelectFamilyId);
+                    getMvpView().setCurrentSelectFamilyId(currentSelectFamilyId);
+                    getMvpView().initView();
                     getPresenter().getSetRoleList(getActivity(), XiaoJIaCommInfo.getUserId(getActivity()), currentSelectFamilyId);
                 }
             }
@@ -3,6 +3,7 @@ package com.cnlive.strike.xiaojiaspeaker.ui.fragment;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
+import android.text.TextUtils;
 import android.view.View;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
@@ -14,8 +15,12 @@ import com.cnlive.strike.xiaojiaspeaker.frame.presenter.SelectIMFriendPresenter;
 import com.cnlive.strike.xiaojiaspeaker.frame.view.SelectIMFriendView;
 public class SelectIMFriendFragment extends MvpBindingFragment<SelectIMFriendView, SelectIMFriendPresenter, Object, FragmentSelectImFriendBinding> {
-    public static SelectIMFriendFragment newInstance() {
+
+    public static SelectIMFriendFragment newInstance(String currentSelectFamilyId) {
         SelectIMFriendFragment fragment = new SelectIMFriendFragment();
+        Bundle bundle = new Bundle();
+        bundle.putString("currentSelectFamilyId", currentSelectFamilyId);
+        fragment.setArguments(bundle);
         return fragment;
     }
@@ -36,7 +41,14 @@ public class SelectIMFriendFragment extends MvpBindingFragment&lt;SelectIMFriendVie
         super.onViewCreated(view, savedInstanceState);
         initTopBar();
         if (null != getMvpView()) {
-            getMvpView().initView();
+            if (null != getArguments()) {
+                String currentSelectFamilyId = getArguments().getString("currentSelectFamilyId");
+                if (!TextUtils.isEmpty(currentSelectFamilyId)) {
+                    getMvpView().initView();
+                    getPresenter().getFamilyMember(getActivity(), currentSelectFamilyId);
+                }
+            }
+
         }
     }
@@ -19,7 +19,8 @@
             android:layout_margin="10dp"
             android:background="@drawable/shape_10_radius_white_bg"
             android:clickable="true"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:visibility="gone">
             <LinearLayout
                 android:layout_width="match_parent"
@@ -59,6 +59,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="5dp"
                 android:ellipsize="end"
+                android:visibility="gone"
                 android:text="用户手机号"
                 android:textColor="@color/color_999999"
                 android:textSize="12sp" />
@@ -65,7 +65,8 @@
                     android:ellipsize="end"
                     android:text="用户手机号"
                     android:textColor="@color/color_999999"
-                    android:textSize="12sp" />
+                    android:textSize="12sp"
+                    android:visibility="gone" />
             </LinearLayout>