CNLive Android Team / newModuleStrike · Commits

Commit 5380ef7f08a686879570cad4a61483c860944b74

Authored by 韩亚云
1 parent c59372f3

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

# Conflicts:
#	app/strike/src/main/java/com/cnlive/strike/MainActivity.java
Inline Side-by-side
Showing 3 changed files with 10 additions and 1 deletions
app/strike/src/main/java/com/cnlive/strike/imgutil/ImgActivity.java
  View file @5380ef7
... ... @@ -110,6 +110,7 @@ public class ImgActivity extends AppCompatActivity {
110 110 data.setFriend(false);
111 111 data.setScan(false);
112 112 data.setCollection(false);
  113 + data.setType("1");
113 114 data.setShowImg(URL1);
114 115 iv_test1.setOnClickListener(view -> PreviewImageViewActivity.startPreviewPictrue(this, view, data));
115 116  
... ...
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/frame/presenter/ScanNewPresenter.java
  View file @5380ef7
... ... @@ -6,7 +6,6 @@ import android.text.TextUtils;
6 6 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
7 7 import com.cnlive.strike.moudle.qr.frame.view.ScanNewView;
8 8 import com.cnlive.strike.moudle.qr.ui.activity.ScanZarBarActivity;
9   -import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
10 9 import com.top.zibin.luban.Luban;
11 10 import com.top.zibin.luban.OnCompressListener;
12 11  
... ...
core/imageload/src/main/java/com/cnlive/core/imageload/preview/PreviewImageViewActivity.java
  View file @5380ef7
... ... @@ -6,6 +6,7 @@ import android.content.Intent;
6 6 import android.graphics.Color;
7 7 import android.view.View;
8 8  
  9 +import com.alibaba.android.arouter.facade.annotation.Route;
9 10 import com.cnlive.core.imageload.R;
10 11 import com.cnlive.core.imageload.databinding.ActivityPreviewImageViewBinding;
11 12 import com.cnlive.core.imageload.preview.adapter.PreviewAdapter;
... ... @@ -24,6 +25,14 @@ import androidx.core.app.ActivityCompat;
24 25 import androidx.core.app.ActivityOptionsCompat;
25 26 import androidx.fragment.app.Fragment;
26 27  
  28 +/**
  29 + * 创建：wukuiqing
  30 + * <p>
  31 + * 时间：2018/3/26
  32 + * <p>
  33 + * 描述：
  34 + */
  35 +@Route(path = "/preview/PreviewImageViewActivity")
27 36 public class PreviewImageViewActivity extends BaseActivity<PreviewImageView, PreviewImagePresenter> {
28 37  
29 38 ImagePreviewShowInfo previewInfo;
... ...