Merge remote-tracking branch 'origin/master'

# Conflicts: # module_xiaojiaSoundBox/src/main/AndroidManifest.xml

Merge remote-tracking branch 'origin/master'
# Conflicts: # module_xiaojiaSoundBox/src/main/AndroidManifest.xml
YangShuai
2 parents c2868514 01dbf5c8
Showing 11 changed files with 353 additions and 28 deletions
.idea/codeStyles/Project.xml
module_xiaojiaSoundBox/src/main/AndroidManifest.xml
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/InvitFriendPresenter.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/InvitFriendView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ShareFriendActivity.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/InvitFriendFragment.java
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/family_bg.png
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/family_bg.png
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/family_bg.png
module_xiaojiaSoundBox/src/main/res/layout/activity_share_friend.xml
module_xiaojiaSoundBox/src/main/res/values/strings.xml
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
     <codeStyleSettings language="XML">
       <arrangement>
         <rules>
@@ -17,6 +17,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <application>
+        <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" />
@@ -55,7 +55,7 @@ public class InvitFriendPresenter extends MvpBasePresenter&lt;InvitFriendView&gt; {
                             return;
                         }
                         getView().hideLoadingView();
-                        getView().initView(baseInfo.getData());
+                        getView().setData(baseInfo.getData());
                     }
                 })
                 .setFailureCallback(new FailureCallback() {
@@ -5,6 +5,7 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.support.v7.widget.LinearLayoutManager;
+import android.text.TextUtils;
 import android.view.View;
 import com.alibaba.android.arouter.launcher.ARouter;
@@ -18,6 +19,7 @@ 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;
@@ -37,6 +39,7 @@ public class InvitFriendView implements MvpView {
     private InvitFriendFragment fragment;
     private List<RoleInfo> roleInfoList;
     private SetRoleAdapter setRoleAdapter;
+    private  String encryptionContent;
     public InvitFriendView(InvitFriendFragment fragment) {
         this.fragment = fragment;
@@ -46,7 +49,17 @@ public class InvitFriendView implements MvpView {
         return fragment == null ? null : fragment.getActivity();
     }
-    public void initView(RoleNetBean roleNetBean) {
+    public void initView(){
+        fragment.binding.btnShare.setOnClickListener(v -> {
+            if(!TextUtils.isEmpty(encryptionContent)){
+                ShareFriendActivity.startActivity(fragment.getActivity(),"","",encryptionContent);
+            }else {
+                //提示跳转失败原因
+            }
+        });
+    }
+
+    public void setData(RoleNetBean roleNetBean) {
         roleInfoList = new ArrayList<>();
         //整理数据
         //获取选中的联系人
@@ -103,7 +116,7 @@ public class InvitFriendView implements MvpView {
             jsonObject.put("type", XiaoJiaConst.QRCODE_TYPE);
             String qrContent = jsonObject.toString();
-            String encryptionContent = SimpleDES.ebotongEncrypto(qrContent, "cnliveIm");
+            encryptionContent = SimpleDES.ebotongEncrypto(qrContent, "cnliveIm");
             encryptionContent = encryptionContent.replaceAll("\\\n", "");
             QrService service = (QrService) ARouter.getInstance().navigation(QrService.class);
             if (null == service) {
+ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.graphics.Bitmap;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.util.Base64;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.cnlive.libs.base.arouter.QrService;
+import com.cnlive.libs.base.util.SimpleDES;
+import com.cnlive.libs.base.util.StatusBarUtil;
+import com.cnlive.libs.base.util.StatusBarUtil2;
+import com.cnlive.strike.application.GlideApp;
+import com.cnlive.strike.xiaojiaspeaker.R;
+import com.cnlive.strike.xiaojiaspeaker.util.DensityUtil;
+import com.cnlive.strike.xiaojiaspeaker.util.lib_permisshelper.PermissionsListener;
+import com.cnlive.strike.xiaojiaspeaker.util.lib_permisshelper.PermissionsUtils;
+import com.qmuiteam.qmui.util.QMUIDrawableHelper;
+import com.qmuiteam.qmui.widget.QMUITopBar;
+
+import org.json.JSONObject;
+
+import java.io.ByteArrayOutputStream;
+
+ public class ShareFriendActivity extends AppCompatActivity {
+
+    private QMUITopBar topBar;
+    private String iconUrl;
+    private String name,encryptionContent;
+    private RelativeLayout share_ry;
+    private ImageView img_icon,erweima;
+    private TextView nametx;
+     private PermissionsUtils mPermissionsUtils = new PermissionsUtils();
+
+    public static void startActivity(Context context,String iconUrl,String name,String erWeiMaContent){
+        Intent intent = new Intent(context,ShareFriendActivity.class);
+        intent.putExtra("iconUrl",iconUrl);
+        intent.putExtra("name",name);
+        intent.putExtra("erWeiMaContent",erWeiMaContent);
+        context.startActivity(intent);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_share_friend);
+        StatusBarUtil.setStatusBarWrite(this);
+        StatusBarUtil2.setColor(this, ContextCompat.getColor(this, R.color.white), 0);
+
+        initView();
+        initData(getIntent());
+    }
+
+    private void initView(){
+        topBar = findViewById(R.id.topbar);
+        share_ry = findViewById(R.id.share_ry);
+        img_icon = findViewById(R.id.img_icon);
+        nametx = findViewById(R.id.name);
+        erweima = findViewById(R.id.erweima);
+
+        findViewById(R.id.share_btn).setOnClickListener(v -> getPermissionsWithTip());
+
+        topBar.setTitle("");
+        //设置返回按钮
+        topBar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        });
+    }
+
+    private void initData(Intent intent){
+        iconUrl = intent.getStringExtra("iconUrl");
+        name = intent.getStringExtra("name");
+
+        GlideApp.with(this).load(iconUrl).into(img_icon);
+        nametx.setText(name);
+
+        encryptionContent = intent.getStringExtra("erWeiMaContent");
+
+        QrService service = (QrService) ARouter.getInstance().navigation(QrService.class);
+        if (null == service) {
+            return;
+        }
+        Bitmap bitmap = service.createQRNoIconBitmap(encryptionContent, DensityUtil.dp2px(this, 245));
+//            binding.ivQr.setBackgroundDrawable(bitmap);
+        if (null != bitmap) {
+            GlideApp.with(this).load(bitmap).into(erweima);
+        }
+    }
+
+
+     private void getPermissionsWithTip() {
+         mPermissionsUtils
+                 .setPermissionsListener(new PermissionsListener() {
+                     @Override
+                     public void onDenied(String[] deniedPermissions) {
+                         getPermissionsWithTip();
+                     }
+
+                     @Override
+                     public void onGranted() {
+                         share();
+                     }
+                 })
+                 .withActivity(this)
+                 .getPermissions(this
+                         , 100
+                         , Manifest.permission.WRITE_EXTERNAL_STORAGE
+                         , Manifest.permission.READ_EXTERNAL_STORAGE
+                 );
+     }
+
+     private void share() {
+         Bitmap qrbm = QMUIDrawableHelper.createBitmapFromView(share_ry);
+         String Base64 = convertIconToString(qrbm);
+         SharedPreferences.Editor editor = getSharedPreferences("sp", Context.MODE_PRIVATE).edit();
+         editor.putString("share_img_string", Base64);
+         editor.commit();
+         ARouter.getInstance().build("/share/ShareImgActivity")
+                 .withString("bitmap", "share_img_string")
+                 .withString("fileName",null)
+                 .navigation(this);
+     }
+
+
+     /**
+      * 图片转成string
+      *
+      * @param bitmap
+      * @return
+      */
+     public String convertIconToString(Bitmap bitmap) {
+         ByteArrayOutputStream baos = new ByteArrayOutputStream();// outputstream
+         bitmap.compress(Bitmap.CompressFormat.PNG, 100, baos);
+         byte[] appicon = baos.toByteArray();// 转为byte数组
+         String img = Base64.encodeToString(appicon, Base64.DEFAULT);
+         return img;
+     }
+
+}
@@ -32,6 +32,7 @@ public class InvitFriendFragment extends MvpBindingFragment&lt;InvitFriendView, Inv
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         initTopBar();
+        if(getMvpView() != null) getMvpView().initView();
         getPresenter().getSetRoleList(getActivity(), XiaoJIaCommInfo.getUserId(getActivity()), XiaoJIaCommInfo.getFamilyId(getActivity()));
     }
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".ui.activity.ShareFriendActivity">
+
+
+    <com.qmuiteam.qmui.widget.QMUITopBar
+        android:id="@+id/topbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/qmui_topbar_height"/>
+
+    <RelativeLayout
+        android:id="@+id/share_ry"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/topbar"
+        android:layout_marginTop="20dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginBottom="60dp"
+        android:background="@drawable/family_bg">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_margin="20dp"
+            android:orientation="vertical">
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="37dp"
+                android:layout_gravity="center_horizontal"
+                android:orientation="horizontal">
+                <ImageView
+                    android:id="@+id/img_icon"
+                    android:layout_width="37dp"
+                    android:layout_height="37dp"
+                    android:src="@drawable/icon_friend"/>
+
+                <TextView
+                    android:id="@+id/name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/color_282828"
+                    android:textSize="16sp"
+                    android:layout_marginLeft="10dp"
+                    android:layout_gravity="center_vertical"
+                    android:text="轻轻的路过"
+                    />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="10dp"
+                    android:text="@string/invite_you"
+                    android:textColor="@color/color_fff"
+                    android:textSize="15sp"
+                    />
+            </LinearLayout>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/scanto_get_invite"
+                android:layout_marginTop="15dp"
+                android:textSize="15sp"
+                android:textColor="@color/color_fff"
+                />
+
+            <ImageView
+                android:id="@+id/erweima"
+                android:layout_width="150dp"
+                android:layout_height="150dp"
+                android:layout_marginTop="15dp"
+                android:layout_gravity="center_horizontal"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="15dp"
+                android:gravity="center">
+
+                <TextView
+                    android:layout_width="15dp"
+                    android:layout_height="15dp"
+                    android:background="@drawable/shape_green_circle"
+                    android:gravity="center"
+                    android:text="1"
+                    android:textColor="@color/white"
+                    android:textSize="11sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:text="下载网家家  >"
+                    android:textColor="@color/color_282828"
+                    android:textSize="12sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="15dp"
+                    android:layout_height="15dp"
+                    android:background="@drawable/shape_green_circle"
+                    android:gravity="center"
+                    android:text="2"
+                    android:textColor="@color/white"
+                    android:textSize="11sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:text="注册/登录  >"
+                    android:textColor="@color/color_282828"
+                    android:textSize="12sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="15dp"
+                    android:layout_height="15dp"
+                    android:background="@drawable/shape_green_circle"
+                    android:gravity="center"
+                    android:text="3"
+                    android:textColor="@color/white"
+                    android:textSize="11sp"
+                    android:textStyle="bold" />
+
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/haseapp_login"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="15dp"
+                android:textSize="15sp"
+                android:textColor="@color/color_282828"
+                android:textStyle="bold"
+                />
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="5dp"
+            android:text="@string/save_bitmap_app_scan"
+            android:textColor="@color/color_282828"
+            android:textSize="15sp"
+            />
+    </RelativeLayout>
+        <TextView
+            android:id="@+id/share_btn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="15dp"
+            android:text="@string/share_family"
+            android:background="@drawable/selector_btn_green"
+            android:textColor="@color/color_fff"
+            android:textSize="16sp"
+            android:paddingTop="5dp"
+            android:paddingBottom="5dp"
+            android:paddingLeft="15dp"
+            android:paddingRight="15dp"
+            />
+</RelativeLayout>
 \ No newline at end of file
@@ -24,4 +24,9 @@
     <string name="go_to_liaten_china">前往听见中国 >></string>
     <string name="open_gps_tip">为确保功能正常使用,请开启GPS!</string>
     <string name="retry">重试</string>
+    <string name="invite_you">邀请你</string>
+    <string name="scanto_get_invite">扫码和他（她）绑定亲情关系</string>
+    <string name="haseapp_login">已安装网家家，请直接登录扫码</string>
+    <string name="save_bitmap_app_scan">-保存图片用网家家扫码-</string>
+    <string name="share_family">分享给家人</string>
 </resources>