Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/newModuleStrike

YangShuai
2 parents dfd95d75 92ef3449
Showing 10 changed files with 159 additions and 25 deletions
app/strike/src/main/java/com/cnlive/strike/imgutil/ImgActivity.java
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/api/ApiServiceQrcode.java
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/frame/presenter/ScanNewPresenter.java
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/routers/QrRouters.java
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/ui/activity/SpeakerBindStateActivity.java
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/uitl/QrContentUtil.java
core/imageload/src/main/AndroidManifest.xml
core/imageload/src/main/java/com/cnlive/core/imageload/preview/PreviewImageViewActivity.java
core/imageload/src/main/res/values/style.xml
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningFinishFragmetPresenter.java
@@ -20,9 +20,11 @@ import com.cnlive.core.imageload.config.PriorityMode;
 import com.cnlive.core.imageload.config.ScaleMode;
 import com.cnlive.core.imageload.loader.ImageLoader;
 import com.cnlive.core.imageload.preview.PreviewImageViewActivity;
+import com.cnlive.core.imageload.preview.model.ImagePreviewShowInfo;
 import com.cnlive.core.imageload.preview.model.PreviewData;
 import com.cnlive.core.imageload.util.DownLoadImageService;
 import com.cnlive.strike.R;
+import com.cnlive.strike.user.auth.UserService;
 import java.io.File;
 import java.util.ArrayList;
@@ -106,10 +108,21 @@ public class ImgActivity extends AppCompatActivity {
                 .into(iv_test1);
         PreviewData data = new PreviewData();
-        data.setLife(false);
-        data.setFriend(false);
-        data.setScan(false);
-        data.setCollection(false);
+        data.setCollection(true);
+        data.setSid(UserService.getUid(this));
+        data.setType("1");
+        data.setUserId(UserService.getUid(this));
+        data.setCollection(true);
+        data.setSave(true);
+
+        ArrayList<ImagePreviewShowInfo> list = new ArrayList<>();
+        ImagePreviewShowInfo info = new ImagePreviewShowInfo();
+        info.setImgPath(URL1);
+        info.setPreviewPath(URL1);
+        list.add(info);
+        data.setPicList(list);
+
+
         data.setShowImg(URL1);
         iv_test1.setOnClickListener(view -> PreviewImageViewActivity.startPreviewPictrue(this, view, data));
@@ -89,7 +89,14 @@ public interface ApiServiceQrcode {
     @POST("Daren/order/addOrderMHT.action")
     Observable<BaseResult<CottonCandyInfo>> getCottonCandy(@QueryMap Map<String, String> param);
+    /**
+     * 生成棉花糖订单信息
+     * @param param
+     * @return
+     */
+    @POST("Daren/group/userAddGroup.action")
+    Observable<BaseResult> userAddGroup(@QueryMap Map<String, String> param);
     /**
      * 音箱家庭邀请成员
@@ -99,14 +106,4 @@ public interface ApiServiceQrcode {
     @POST("Daren/sound/familyGroupInviteYD.action")
     Observable<BaseResult> familyGroupInviteYD(@QueryMap()  Map<String, String> map);
-
-    /**
-     * 生成棉花糖订单信息
-     * @param param
-     * @return
-     */
-
-    @POST("Daren/group/userAddGroup.action")
-    Observable<BaseResult> userAddGroup(@QueryMap Map<String, String> param);
-
 }
@@ -6,7 +6,6 @@ import android.text.TextUtils;
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.strike.moudle.qr.frame.view.ScanNewView;
 import com.cnlive.strike.moudle.qr.ui.activity.ScanZarBarActivity;
-import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
 import com.top.zibin.luban.Luban;
 import com.top.zibin.luban.OnCompressListener;
@@ -198,4 +198,21 @@ public class QrRouters {
                 .withBoolean("isStarPage", isStarPage)
                 .navigation(context);
     }
+
+
+    public static void startChatActivity(Context context,String groupId,String groupName){
+
+        ARouter.getInstance().build("/chat/ChatActivity")
+                .withString("targetId", groupId)
+                .withString("chatType", "Private")
+                .withString("conversationName", groupName)
+                .navigation(context);
+    }
+    public static void startChatGroupDetailActivity(Context context,String groupId,String groupName){
+
+        ARouter.getInstance().build("/cnconversation/ChatGroupDetailActivity")
+                .withString("groupId", groupId)
+                .withString("groupName", groupName)
+                .navigation(context);
+    }
 }
@@ -3,6 +3,7 @@ package com.cnlive.strike.moudle.qr.ui.activity;
 import android.content.Context;
 import android.content.Intent;
+import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
 import com.cnlive.strike.moudle.qr.R;
 import com.cnlive.strike.moudle.qr.databinding.ActivitySpeakerBindStateBinding;
@@ -17,6 +18,7 @@ import com.cnlive.strike.moudle.qr.frame.view.SpeakerBindStateView;
  * <p>
  * 简介: 音响绑定状态
  */
+@Route(path = "/qr/SpeakerBindStateActivity")
 public class SpeakerBindStateActivity extends BaseActivity<SpeakerBindStateView, SpeakerBindStatePresenter> {
     public ActivitySpeakerBindStateBinding binding;
@@ -60,8 +60,6 @@ public class QrContentUtil {
     public QrContentBean getQrContentBean(String result) {
         QrContentBean bean = new QrContentBean();
         JSONObject jsonObject = null;
-
-
         try {
             if (!TextUtils.isEmpty(result) && result.startsWith("http://apps.pay.cnlive.com/cash-register/payauto/default?")) {
                 Uri uri = Uri.parse(result);
@@ -130,6 +128,7 @@ public class QrContentUtil {
                         bean.setContent(homepageId);
                         bean.setType(type);
                         break;
+
                     case "subscriShareType":
                         String homepageid = (String) jsonObject.get("homepageId");
                         if (TextUtils.isEmpty(homepageid)) {
@@ -151,6 +150,18 @@ public class QrContentUtil {
                         bean.setContent(content);
                         bean.setType(type);
                         break;
+                    case "groupQrType":
+                        String qrContent = (String) jsonObject.get("content");
+                        if (TextUtils.isEmpty(qrContent)) {
+                            bean.setType("other");
+                            bean.setContent(result);
+                            return bean;
+                        }
+                        bean.setContent(qrContent);
+                        bean.setType(type);
+
+                        break;
+
                     default:
                         bean.setType("other");
@@ -179,6 +190,7 @@ public class QrContentUtil {
         return bean;
     }
+
     public void getQrContent(Context mContext, String content, IdentifyTheQRCodeCallback successfulCallback) {
         if (TextUtils.isEmpty(content)) AlertUtil.showDeftToast(mContext, "请选择有效的二维码");
@@ -217,16 +229,23 @@ public class QrContentUtil {
                                     jumpWitnessInfo(mContext, data.getContent(), successfulCallback);
                                     break;
                                 case "dazhongQrType":
+                                    //大众体育
                                     jumpSportInfo(mContext, data.getContent(), successfulCallback);
                                     break;
                                 case "starMoodShareType":
-                                    jumpStartInfo(mContext, data.getContent(), successfulCallback,true);
+                                    //明星主页
+                                    jumpStartInfo(mContext, data.getContent(), successfulCallback, true);
                                     break;
                                 case "xiaoJiaSpeakerType":
+                                    //小家音响
                                     jumpXiaoJiaSpeaker(mContext, data.getContent(), successfulCallback);
                                     break;
                                 case "subscriShareType":
-                                    jumpStartInfo(mContext, data.getContent(), successfulCallback,false);
+                                    jumpStartInfo(mContext, data.getContent(), successfulCallback, false);
+                                    break;
+                                case "groupQrType":
+                                    //公共群组
+                                    jumpGroupInfo(mContext, data.getContent(), successfulCallback);
                                     break;
                                 default:
@@ -243,11 +262,18 @@ public class QrContentUtil {
         );
     }
+    /**
+     * 小家音响
+     *
+     * @param mContext
+     * @param content
+     * @param successfulCallback
+     */
     private void jumpXiaoJiaSpeaker(Context mContext, String content, IdentifyTheQRCodeCallback successfulCallback) {
-        if (!TextUtils.isEmpty(content)){
-            SpeakerBindStateActivity.startActivity(mContext,content);
+        if (!TextUtils.isEmpty(content)) {
+            SpeakerBindStateActivity.startActivity(mContext, content);
             successfulCallback.qRCodeCallback(true, "");
-        }else {
+        } else {
             successfulCallback.qRCodeCallback(false, "数据异常");
         }
@@ -271,6 +297,50 @@ public class QrContentUtil {
     }
+    /**
+     * 公共群组
+     *
+     * @param context
+     * @param content
+     * @param successfulCallback
+     */
+    public static void jumpGroupInfo(Context context, String content, IdentifyTheQRCodeCallback successfulCallback) {
+        try {
+            JSONObject jsonObject = new JSONObject(content);
+
+            String groupId = jsonObject.getString("groupId");
+            String groupName = jsonObject.getString("groupName");
+
+            QrRouters.startChatGroupDetailActivity(context, groupId, groupName);
+            successfulCallback.qRCodeCallback(true, "");
+//            HashMap<String, String> hashMap = new HashMap<>();
+//            hashMap.put("groupId",groupId);
+//            hashMap.put("sid",UserService.getUid(context));
+//            Logic.create(hashMap).action(new Logic.Action<Map<String, String>, BaseInfo>() {
+//                @Override
+//                public Disposable action(Map<String, String> stringStringMap, DataCallback<BaseInfo> dataCallback) {
+//                    return ApiRequest.service(ApiServiceQrcode.class, apiServiceQrcode -> apiServiceQrcode.userAddGroup(stringStringMap)).subscribe(context, dataCallback);
+//                }
+//            }).<BaseInfo>event().setFailureCallback(new FailureCallback() {
+//                @Override
+//                public void onFailure(int i, String s) {
+//                    successfulCallback.qRCodeCallback(false, s);
+//                }
+//            }).setSuccessCallback(new SuccessCallback<BaseInfo>() {
+//                @Override
+//                public void onSuccess(BaseInfo baseInfo) {
+//                    QrRouters.startChatActivity(context, groupId, groupName);
+//                    successfulCallback.qRCodeCallback(true, "");
+//                }
+//            }).start();
+//
+
+        } catch (JSONException e) {
+            e.printStackTrace();
+            successfulCallback.qRCodeCallback(false, "数据异常");
+        }
+    }
+
     private void scanCottonCandyActivity(Context mContext, QrContentBean data, IdentifyTheQRCodeCallback successfulCallback) {
         if (mContext == null) return;
@@ -3,8 +3,23 @@
     package="com.cnlive.core.imageload">
     <application>
-        <activity android:name=".preview.DataProcessingActivity"></activity>
-        <activity android:name=".preview.PreviewImageViewActivity" />
+        <activity
+        android:name=".preview.PreviewImageViewActivity"
+        android:configChanges="keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation"
+        android:launchMode="singleTop"
+        android:theme="@style/Theme.AppCompat.NoActionBar"/>
+    <activity
+        android:name=".preview.DataProcessingActivity"
+        android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+        android:launchMode="singleTop"
+        android:theme="@style/ProcessHtmlDialogActivityTheme">
+        <intent-filter>
+            <action android:name="com.cnlive.strike.moudle.preview.ui.DataProcessingActivity" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <!-- 文字类型 -->
+            <data android:mimeType="text/plain" />
+        </intent-filter>
+    </activity>
     </application>
 </manifest>
 \ No newline at end of file
@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.graphics.Color;
 import android.view.View;
+import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cnlive.core.imageload.R;
 import com.cnlive.core.imageload.databinding.ActivityPreviewImageViewBinding;
 import com.cnlive.core.imageload.preview.adapter.PreviewAdapter;
@@ -24,6 +25,14 @@ import androidx.core.app.ActivityCompat;
 import androidx.core.app.ActivityOptionsCompat;
 import androidx.fragment.app.Fragment;
+/**
+ * 创建：wukuiqing
+ * <p>
+ * 时间：2018/3/26
+ * <p>
+ * 描述：
+ */
+@Route(path = "/preview/PreviewImageViewActivity")
 public class PreviewImageViewActivity extends BaseActivity<PreviewImageView, PreviewImagePresenter> {
     ImagePreviewShowInfo previewInfo;
@@ -57,6 +66,7 @@ public class PreviewImageViewActivity extends BaseActivity&lt;PreviewImageView, Pre
         getWindow().getDecorView().setBackgroundColor(Color.TRANSPARENT);
         StatusBarUtil.setTransparentForWindow(this);
         StatusBarUtil.addTranslucentView(this,0);
+        if (getPresenter()!=null)getPresenter().processData(PreviewImageViewActivity.this,getIntent());
     }
     @Override
@@ -28,4 +28,15 @@
         <item name="android:background">@drawable/qmui_tip_dialog_bg</item>
     </style>
+    <style name="ProcessHtmlDialogActivityTheme" parent="Theme.AppCompat.Dialog">
+        <item name="android:windowFrame">@android:color/transparent</item><!--边框-->
+        <item name="android:windowIsFloating">true</item><!--是否浮现在activity之上-->
+        <item name="android:windowIsTranslucent">true</item><!--半透明-->
+        <item name="android:windowBackground">@android:color/transparent</item><!--背景透明-->
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionBar">true</item>
+        <item name="android:windowActionBar">true</item>
+        <item name="android:windowCloseOnTouchOutside">false</item>
+    </style>
+
 </resources>
 \ No newline at end of file
@@ -468,6 +468,6 @@ public class RunningFinishFragmetPresenter extends BasePresenter&lt;RunningFinishFr
 //            });
 ////
 //        }
-//    }, 2000);
+//    }, 2000);u
     //
 }