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

YangShuai
2 parents ce60638e e25988c4
Showing 10 changed files with 222 additions and 100 deletions
app/strike/src/main/AndroidManifest.xml
app/strike/src/main/assets/timgs.png
app/strike/src/main/java/com/cnlive/strike/imgutil/ImgActivity.java
app/strike/src/main/res/layout/activity_img.xml
app/strike/src/main/res/mipmap-hdpi/timg.gif
app/strike/src/main/res/mipmap-hdpi/timgs.png
app/strike/src/main/res/raw/timgs.png
core/imageload/build.gradle
core/imageload/src/androidTest/java/com/mm999/imageload/ExampleInstrumentedTest.java
core/imageload/src/test/java/com/mm999/imageload/ExampleUnitTest.java
@@ -18,6 +18,7 @@
         android:theme="@style/AppTheme">
         <activity android:name=".demo.activity.DemoActivity" />
         <activity android:name=".MyActivity"></activity>
+        <activity android:name=".imgutil.ImgActivity"/>
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -3,20 +3,32 @@ package com.cnlive.strike.imgutil;
 import androidx.appcompat.app.AppCompatActivity;
 import android.animation.ObjectAnimator;
+import android.graphics.Bitmap;
+import android.graphics.Rect;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
 import android.view.View;
-import android.view.ViewPropertyAnimator;
 import android.widget.ImageView;
+import android.widget.Toast;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.transition.ViewPropertyTransition;
+import com.cnlive.core.imageload.callback.ImageDownLoadCallBack;
+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.util.DownLoadImageService;
 import com.cnlive.strike.R;
+import java.io.File;
+import java.util.ArrayList;
+
 public class ImgActivity extends AppCompatActivity {
     private ImageView iv_test1;
     private ImageView iv_test2;
-    private ImageView iv_test02;
     private ImageView iv_test3;
     private ImageView iv_test4;
     private ImageView iv_test5;
@@ -26,12 +38,28 @@ public class ImgActivity extends AppCompatActivity {
     private ImageView iv_test9;
     private ImageView iv_test10;
     private ImageView iv_test11;
-    private ImageView iv_test12;
-    private ImageView iv_test13;
-    private ImageView iv_test14;
-    private ImageView iv_test15;
+
+
+    Handler handler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            if (msg.what == 1) {
+                iv_test11.setImageBitmap(bitmaps);
+            }
+        }
+    };
+
     String URL1 = "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1574403931080&di=ea10bd1adb20025f02e296d8694f7bb4&imgtype=0&src=http%3A%2F%2Fimg3.duitang.com%2Fuploads%2Fitem%2F201506%2F23%2F20150623164841_jtvR3.thumb.700_0.jpeg";
+    String URL2 = "https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=1035013881,3985887911&fm=26&gp=0.jpg";
+
+
+    String FOREWARD_SLASH = "/";
+    String ASSERTS_PATH  ="file:///android_asset/" ;
+    String ANDROID_RESOURCE  ="android.resource://" ;
+    String RAW  ="/raw/" ;
+    Bitmap bitmaps;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -45,7 +73,6 @@ public class ImgActivity extends AppCompatActivity {
     private void findview() {
         iv_test1 = findViewById(R.id.iv_test1);
         iv_test2 = findViewById(R.id.iv_test2);
-        iv_test02 = findViewById(R.id.iv_test02);
         iv_test3 = findViewById(R.id.iv_test3);
         iv_test4 = findViewById(R.id.iv_test4);
         iv_test5 = findViewById(R.id.iv_test5);
@@ -55,10 +82,6 @@ public class ImgActivity extends AppCompatActivity {
         iv_test9 =  findViewById(R.id.iv_test9);
         iv_test10 =  findViewById(R.id.iv_test10);
         iv_test11 =  findViewById(R.id.iv_test11);
-        iv_test12 =  findViewById(R.id.iv_test12);
-        iv_test13 =  findViewById(R.id.iv_test13);
-        iv_test14 =  findViewById(R.id.iv_test14);
-        iv_test15 =  findViewById(R.id.iv_test15);
     }
@@ -74,21 +97,126 @@ public class ImgActivity extends AppCompatActivity {
             }
         };
+
+//        //组织数据
+//        ArrayList<ThumbViewInfo> mThumbViewInfoList = new ArrayList<>(); // 这个最好定义成成员变量
+//        ThumbViewInfo item;
+//        mThumbViewInfoList.clear();
+//        for (int i = 0;i < resultList.size(); i++) {
+//            Rect bounds = new Rect();
+//            //new ThumbViewInfo(图片地址);
+//            item=new ThumbViewInfo(resultList.get(i).getOriginUrl());
+//            item.setBounds(bounds);
+//            mThumbViewInfoList.add(item);
+//        }
+//
+////打开预览界面
+//        GPreviewBuilder.from(Context context)
+//                //是否使用自定义预览界面，当然8.0之后因为配置问题，必须要使用
+//                .to(ImageLookActivity.class)
+//                .setData(mThumbViewInfoList)
+//                .setCurrentIndex(position)
+//                .setSingleFling(true)
+//                .setType(GPreviewBuilder.IndicatorType.Number)
+//                // 小圆点
+////  .setType(GPreviewBuilder.IndicatorType.Dot)
+//                .start();//启动
+
         ImageLoader.with(this)
                 .url(URL1)
                 .animate(animation)
+                .scale(ScaleMode.CENTER_CROP)
                 .into(iv_test1);
         ImageLoader.with(this)
                 .url(URL1)
-                .scale(1)//缩放几倍
-                .into(iv_test02);
+                .scale(ScaleMode.FIT_CENTER)
+                .into(iv_test2);
+
+//        Glide.with(this).asGif().diskCacheStrategy(DiskCacheStrategy.RESOURCE).load(URL2).into(iv_test3);
         ImageLoader.with(this)
-                .url(URL1)
-                .scale(3)
-                .into(iv_test2);
+                .url(URL2)
+                .placeHolder(R.mipmap.ic_launcher)
+                .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
+                .scale(ScaleMode.FIT_CENTER)
+                .into(iv_test3);
+
+        ImageLoader.with(this)
+                .res(R.mipmap.timg)
+                .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
+                .into(iv_test4);
+        ImageLoader.with(this)
+                .res(R.mipmap.timgs)
+                .into(iv_test5);
+
+        ImageLoader.with(this)
+                .res(R.mipmap.timgs)
+                .vignetteFilter()//晕映
+                .priority(PriorityMode.PRIORITY_NORMAL)//优先级
+                .into(iv_test6);
+
+        ImageLoader.with(this)
+                .res(R.mipmap.timgs)
+                .sketchFilter()
+                .into(iv_test7);
+
+        ImageLoader.with(this)
+                .res(R.mipmap.timgs)
+                .sketchFilter()
+                .into(iv_test7);
+
+            //加载本地图片
+//        ImageLoader.with(this)
+//                .file(new File(getFilesDir(), IMG_NAME_C))
+//                .placeHolder(R.mipmap.ic_launcher)
+//                .scale(ScaleMode.FIT_CENTER)
+//                .into(iv_test7);
+        ImageLoader.with(this)
+                .asserts(ASSERTS_PATH + "timgs.png")
+                .into(iv_test8);
+
+        ImageLoader.with(this)
+                .raw(ANDROID_RESOURCE+getPackageName()+RAW+R.raw.timgs)
+                .placeHolder(R.mipmap.ic_launcher)
+                .scale(ScaleMode.FIT_CENTER)
+                .asCircle()
+                .into(iv_test9);
+
+        ImageLoader.with(this)
+                .res(R.mipmap.timgs)
+                .placeHolder(R.mipmap.ic_launcher)
+                .scale(ScaleMode.FIT_CENTER)
+                .rectRoundCorner(50)
+                .into(iv_test10);
+
+           // .asSquare()//正方形
+
+        findViewById(R.id.down).setOnClickListener(view -> {
+            ImageLoader.saveImageIntoGallery(new DownLoadImageService(ImgActivity.this, URL1, true, "lala", new ImageDownLoadCallBack() {
+
+                @Override
+                public void onDownLoadSuccess(Bitmap bitmap) {
+                    Log.e("sssssss", "onDownLoadSuccess: " );
+                    //网络请求
+                    bitmaps = bitmap;
+                    Message msg = new Message();
+                    //将获取到的String装载到msg中
+                    msg.what = 1;
+                    //发消息到主线程
+                    handler.sendMessage(msg);
+                }
+
+                @Override
+                public void onDownLoadFailed() {
+//                    Toast.makeText(ImgActivity.this,"下载",Toast.LENGTH_SHORT).show();
+                }
+
+            }));
+        });
     }
+
+
 }
@@ -23,100 +23,122 @@
             android:layout_height="wrap_content"
             android:text="放大缩小："
             />
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-            <ImageView
-                android:id="@+id/iv_test02"
-                android:layout_width="300dp"
-                android:layout_height="300dp"
-                android:padding="10dp" />
             <ImageView
                 android:id="@+id/iv_test2"
-                android:layout_width="300dp"
-                android:layout_height="300dp"
+                android:layout_width="200dp"
+                android:layout_height="200dp"
                 android:padding="10dp" />
-        </LinearLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="网络gif："
+            />
         <ImageView
             android:id="@+id/iv_test3"
             android:layout_width="300dp"
             android:layout_height="300dp"
-            android:padding="30dp" />
-
+            android:padding="10dp" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="mipmap下的gif："
+            />
         <ImageView
             android:id="@+id/iv_test4"
             android:layout_width="300dp"
             android:layout_height="300dp"
-            android:padding="30dp" />
+            android:padding="10dp" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="mipmap下的图片："
+            />
         <ImageView
             android:id="@+id/iv_test5"
             android:layout_width="300dp"
             android:layout_height="300dp"
-            android:padding="30dp" />
+            android:padding="10dp" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="滤镜优先级设置"
+            />
         <ImageView
             android:id="@+id/iv_test6"
             android:layout_width="300dp"
             android:layout_height="300dp"
             android:padding="30dp" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="素描"
+            />
         <ImageView
             android:id="@+id/iv_test7"
             android:layout_width="300dp"
             android:layout_height="300dp"
             android:padding="30dp" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="加载asserts下面的图片"
+            />
+
         <ImageView
             android:id="@+id/iv_test8"
             android:layout_width="300dp"
             android:layout_height="300dp"
             android:padding="30dp" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="加载raw下面的图片为圆"
+            />
         <ImageView
             android:id="@+id/iv_test9"
             android:layout_width="300dp"
             android:layout_height="300dp"
             android:padding="30dp" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="图片设置圆角"
+            />
         <ImageView
             android:id="@+id/iv_test10"
             android:layout_width="300dp"
             android:layout_height="300dp"
             android:padding="30dp" />
-        <ImageView
-            android:id="@+id/iv_test11"
-            android:layout_width="300dp"
-            android:layout_height="300dp"
-            android:padding="30dp" />
-
-        <ImageView
-            android:id="@+id/iv_test12"
-            android:layout_width="300dp"
-            android:layout_height="300dp"
-            android:padding="30dp" />
-
-        <ImageView
-            android:id="@+id/iv_test13"
-            android:layout_width="300dp"
-            android:layout_height="300dp"
-            android:padding="30dp" />
-
-        <ImageView
-            android:id="@+id/iv_test14"
-            android:layout_width="300dp"
-            android:layout_height="300dp"
-            android:padding="30dp" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="图片下载显示"
+            />
+        <Button
+            android:id="@+id/down"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="下载"/>
         <ImageView
-            android:id="@+id/iv_test15"
+            android:id="@+id/iv_test11"
             android:layout_width="300dp"
             android:layout_height="300dp"
             android:padding="30dp" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="直接代码设置，五边形"/>
         <com.cnlive.core.imageload.util.MultiView
             android:layout_width="300dp"
@@ -124,8 +146,14 @@
             android:layout_margin="30dp"
             lb:angleCount="5"
             lb:type="multi"
+            android:src="@mipmap/timgs"
             />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="直接代码设置，设置圆角"/>
+
         <com.cnlive.core.imageload.util.MultiView
             android:layout_width="200dp"
             android:layout_height="200dp"
@@ -133,13 +161,20 @@
             android:layout_gravity="center"
             lb:borderRadius="10dp"
             lb:type="round"
+            android:src="@mipmap/timgs"
             />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="直接代码设置圆"/>
+
         <com.cnlive.core.imageload.util.MultiView
             android:layout_margin="30dp"
             android:layout_width="200dp"
             android:layout_height="200dp"
             android:layout_gravity="center"
+            android:src="@mipmap/timgs"
             lb:type="circle"
             />
@@ -37,4 +37,6 @@ dependencies {
     implementation 'jp.wasabeef:glide-transformations:3.0.1'
     //滤镜
     implementation 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.4.1'
+    //图片预览
+//    implementation 'com.ycjiang:imgepreviewlibrary:1.1.3'
 }
-package com.mm999.imageload;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-
-        assertEquals("com.mm999.imageload.test", appContext.getPackageName());
-    }
-}
-package com.mm999.imageload;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}
 \ No newline at end of file