Skip to content

Commit 67e6025

Browse files
committed
增加了简单的loading
1 parent 24ed343 commit 67e6025

File tree

4 files changed

+54
-33
lines changed

4 files changed

+54
-33
lines changed

app/src/main/java/com/wanglu/photoviewer/MainActivity.kt

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.os.Bundle
44
import android.support.v7.app.AppCompatActivity
55
import android.widget.ImageView
66
import com.bumptech.glide.Glide
7+
import com.bumptech.glide.request.RequestOptions
78
import com.wanglu.photoviewerlibrary.PhotoViewer
89
import kotlinx.android.synthetic.main.activity_main.*
910

@@ -20,14 +21,27 @@ class MainActivity : AppCompatActivity() {
2021
"http://wallpaper-pub.d2collection.com/class/cover/%E5%8A%A8%E6%BC%AB.png"
2122
)
2223

23-
// val adapter = GvAdapter(this)
24-
// gv.adapter = adapter
25-
// adapter.setData(picData)
26-
// gv.setOnItemClickListener { _, view, position, _ ->
24+
val adapter = GvAdapter(this)
25+
gv.adapter = adapter
26+
adapter.setData(picData)
27+
gv.setOnItemClickListener { _, view, position, _ ->
28+
PhotoViewer
29+
.setData(picData)
30+
.setCurrentPage(position)
31+
.setImgContainer(gv)
32+
.setShowImageViewInterface(object : PhotoViewer.ShowImageViewInterface {
33+
override fun show(iv: ImageView, url: String) {
34+
Glide.with(iv.context).load(url).apply(RequestOptions.placeholderOf(R.mipmap.ic_launcher)).into(iv)
35+
}
36+
})
37+
.start(this)
38+
}
39+
40+
// Glide.with(this).load(picData[3]).into(iv)
41+
//
42+
// iv.setOnClickListener {
2743
// PhotoViewer
28-
// .setData(picData)
29-
// .setCurrentPage(position)
30-
// .setImgContainer(gv)
44+
// .setClickSingleImg(picData[3], iv)
3145
// .setShowImageViewInterface(object : PhotoViewer.ShowImageViewInterface {
3246
// override fun show(iv: ImageView, url: String) {
3347
// Glide.with(iv.context).load(url).into(iv)
@@ -36,18 +50,5 @@ class MainActivity : AppCompatActivity() {
3650
// .start(this)
3751
// }
3852

39-
Glide.with(this).load(picData[3]).into(iv)
40-
41-
iv.setOnClickListener {
42-
PhotoViewer
43-
.setClickSingleImg(picData[3], iv)
44-
.setShowImageViewInterface(object : PhotoViewer.ShowImageViewInterface {
45-
override fun show(iv: ImageView, url: String) {
46-
Glide.with(iv.context).load(url).into(iv)
47-
}
48-
})
49-
.start(this)
50-
}
51-
5253
}
5354
}

app/src/main/res/layout/activity_main.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010

1111

1212

13-
<!--<GridView-->
14-
<!--android:id="@+id/gv"-->
15-
<!--android:layout_width="match_parent"-->
16-
<!--android:gravity="center"-->
17-
<!--android:layout_height="wrap_content"-->
18-
<!--android:numColumns="3"-->
19-
<!--android:layout_gravity="center"/>-->
13+
<GridView
14+
android:id="@+id/gv"
15+
android:layout_width="match_parent"
16+
android:gravity="center"
17+
android:layout_height="wrap_content"
18+
android:numColumns="3"
19+
android:layout_gravity="center"/>
2020

2121

22-
<ImageView
23-
android:id="@+id/iv"
24-
android:layout_width="100dp"
25-
android:layout_height="100dp"
26-
android:layout_marginLeft="50dp"
27-
android:layout_marginTop="50dp"/>
22+
<!--<ImageView-->
23+
<!--android:id="@+id/iv"-->
24+
<!--android:layout_width="100dp"-->
25+
<!--android:layout_height="100dp"-->
26+
<!--android:layout_marginLeft="50dp"-->
27+
<!--android:layout_marginTop="50dp"/>-->
2828
</FrameLayout>

photoviewer/src/main/java/com/wanglu/photoviewerlibrary/PhotoViewerFragment.kt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,19 @@ class PhotoViewerFragment : BaseLazyFragment() {
3838
mIv.setExitLocation(mExitLocation)
3939
mIv.setImgSize(mImgSize)
4040

41+
// 循环查看是否添加上了图片
42+
Thread(Runnable {
43+
while(true){
44+
if(mIv.drawable != null){
45+
activity!!.runOnUiThread {
46+
loading.visibility = View.GONE
47+
}
48+
break
49+
}
50+
Thread.sleep(100)
51+
}
52+
}).start()
53+
4154
var intAlpha = 255
4255
root.background.alpha = intAlpha
4356
mIv.rootView = root

photoviewer/src/main/res/layout/item_picture.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,11 @@
1111
android:layout_height="match_parent"
1212
android:layout_gravity="center"
1313
android:background="@color/transparentColor"/>
14+
15+
<ProgressBar
16+
android:id="@+id/loading"
17+
android:layout_width="wrap_content"
18+
android:layout_height="wrap_content"
19+
20+
android:layout_gravity="center"/>
1421
</FrameLayout>

0 commit comments

Comments
 (0)