From dde9027478b772dd60371937413ac2838c4f3bbd Mon Sep 17 00:00:00 2001 From: zuoxiao <470321431@qq.com> Date: 星期二, 11 二月 2025 09:56:33 +0800 Subject: [PATCH] 1.修改library名称 2.取水口接口相关代码 --- bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/decoder/SkiaPooledImageRegionDecoder.java | 0 bigimage_library/src/main/res/drawable-xhdpi/icon_download_new.png | 0 app/src/main/java/com/dayu/pipirrapp/dao/PipeNetDao.java | 50 ++++++++++++++++ bigimage_library/src/main/java/cc/shinichi/library/view/ImagePreviewAdapter.kt | 0 bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnPageDragListener.kt | 0 bigimage_library/src/main/java/cc/shinichi/library/bean/ImageInfo.kt | 0 bigimage_library/src/main/java/cc/shinichi/library/tool/common/HandlerHolder.kt | 0 bigimage_library/src/main/java/cc/shinichi/library/tool/image/DownloadUtil.kt | 0 bigimage_library/src/main/java/cc/shinichi/library/view/nine/ViewHelper.java | 0 bigimage_library/src/main/java/cc/shinichi/library/view/photoview/OnGestureListener.java | 0 bigimage_library/src/main/res/drawable/shape_indicator_bg.xml | 0 bigimage_library/src/main/java/cc/shinichi/library/ImagePreview.kt | 0 bigimage_library/src/main/java/cc/shinichi/library/view/photoview/Util.java | 0 bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnPageFinishListener.kt | 0 bigimage_library/src/main/java/cc/shinichi/library/tool/common/ToastUtil.kt | 0 bigimage_library/src/main/res/drawable-xhdpi/icon_video_stop.png | 0 bigimage_library/src/main/java/cc/shinichi/library/view/photoview/PhotoViewAttacher.java | 0 bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/decoder/SkiaImageRegionDecoder.java | 0 bigimage_library/src/main/java/cc/shinichi/library/glide/progress/ProgressManager.kt | 0 bigimage_library/src/main/res/values/strings.xml | 0 bigimage_library/src/main/AndroidManifest.xml | 0 bigimage_library/src/main/java/cc/shinichi/library/view/photoview/OnPhotoTapListener.java | 0 bigimage_library/src/main/java/cc/shinichi/library/glide/progress/ProgressResponseBody.kt | 0 bigimage_library/src/main/res/values-en-rUS/strings.xml | 0 expand_button/src/main/java/com/example/expand_button/ExpandButton.kt | 52 +++++++++++++++++ bigimage_library/src/main/java/cc/shinichi/library/view/photoview/OnScaleChangedListener.java | 0 bigimage_library/src/main/res/drawable-xxhdpi/icon_video_play.png | 0 bigimage_library/src/main/java/cc/shinichi/library/view/photoview/OnOutsidePhotoTapListener.java | 0 bigimage_library/src/main/res/anim/fade_out.xml | 0 bigimage_library/src/main/res/values/ids.xml | 0 bigimage_library/src/main/java/cc/shinichi/library/tool/common/SLog.kt | 0 bigimage_library/src/main/java/cc/shinichi/library/glide/progress/ProgressLibraryGlideModule.kt | 0 bigimage_library/src/main/java/cc/shinichi/library/glide/SSLSocketClient.kt | 0 bigimage_library/src/main/java/cc/shinichi/library/tool/image/ImageUtil.kt | 0 bigimage_library/src/main/res/drawable-xxhdpi/icon_video_stop.png | 0 bigimage_library/src/main/res/layout/sh_item_photoview.xml | 0 bigimage_library/src/main/res/values/attrs.xml | 0 app/src/main/java/com/dayu/pipirrapp/dao/AppDatabase.java | 5 + bigimage_library/src/main/java/cc/shinichi/library/tool/common/NetworkUtil.kt | 0 bigimage_library/src/main/java/cc/shinichi/library/tool/file/FileUtil.kt | 0 bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnOriginProgressListener.kt | 0 bigimage_library/src/main/res/layout/sh_media_controller.xml | 0 bigimage_library/src/main/res/values/style.xml | 0 bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnBigImagePageChangeListener.kt | 0 bigimage_library/src/main/java/cc/shinichi/library/view/nine/AnimatorProxy.java | 0 bigimage_library/src/main/java/cc/shinichi/library/InitProvider.kt | 0 bigimage_library/src/main/java/cc/shinichi/library/view/HackyViewPager.kt | 0 bigimage_library/src/main/java/cc/shinichi/library/view/photoview/PhotoView.java | 0 app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java | 46 +++++++++++---- bigimage_library/src/main/java/cc/shinichi/library/GlobalContext.kt | 0 bigimage_library/src/main/res/anim/scale_in.xml | 0 bigimage_library/src/main/java/cc/shinichi/library/tool/common/UIUtil.kt | 0 bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnBigImageLongClickListener.kt | 0 bigimage_library/src/main/res/drawable-xhdpi/icon_video_play.png | 0 bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnDownloadClickListener.kt | 0 bigimage_library/src/main/java/cc/shinichi/library/glide/FileTarget.kt | 0 bigimage_library/src/main/java/cc/shinichi/library/glide/progress/OnProgressListener.kt | 0 bigimage_library/src/main/java/cc/shinichi/library/tool/common/HttpUtil.kt | 0 bigimage_library/src/main/java/cc/shinichi/library/tool/common/PhoneUtil.kt | 0 bigimage_library/src/main/java/cc/shinichi/library/view/photoview/OnViewTapListener.java | 0 bigimage_library/src/main/res/drawable-xhdpi/load_failed.png | 0 app/build.gradle | 3 bigimage_library/src/main/java/cc/shinichi/library/view/ImagePreviewFragment.kt | 0 bigimage_library/src/main/java/cc/shinichi/library/view/photoview/OnViewDragListener.java | 0 bigimage_library/src/main/res/drawable-xxhdpi/load_failed.png | 0 bigimage_library/src/main/res/drawable-xhdpi/icon_change_orientation.png | 0 bigimage_library/src/main/res/layout/sh_layout_preview.xml | 0 bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnDownloadListener.kt | 0 bigimage_library/src/main/res/drawable-xhdpi/ic_action_close.png | 0 bigimage_library/src/main/java/cc/shinichi/library/glide/cache/DataCacheKey.kt | 0 bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnFinishListener.kt | 0 bigimage_library/build.gradle | 1 bigimage_library/src/main/res/anim/fade_in.xml | 0 bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnBigImageClickListener.kt | 0 bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/decoder/ImageRegionDecoder.java | 0 bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/decoder/SkiaImageDecoder.java | 0 bigimage_library/src/main/java/cc/shinichi/library/glide/ImageLoader.kt | 0 bigimage_library/src/main/res/drawable-xxhdpi/icon_change_orientation.png | 0 bigimage_library/src/main/res/drawable/gray_circle_bg.xml | 0 bigimage_library/src/main/java/cc/shinichi/library/view/photoview/OnMatrixChangedListener.java | 0 bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/decoder/ImageDecoder.java | 0 bigimage_library/proguard-rules.pro | 0 bigimage_library/src/main/java/cc/shinichi/library/view/photoview/OnSingleFlingListener.java | 0 bigimage_library/src/main/java/cc/shinichi/library/view/photoview/Compat.java | 0 bigimage_library/src/main/java/cc/shinichi/library/view/ImagePreviewActivity.kt | 0 bigimage_library/src/main/res/layout/sh_default_progress_layout.xml | 0 bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/decoder/DecoderFactory.java | 0 bigimage_library/.gitignore | 0 bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnCustomLayoutCallback.kt | 0 bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/SubsamplingScaleImageView.java | 0 app/src/main/java/com/dayu/pipirrapp/activity/OrderDetailActivity.java | 1 bigimage_library/src/main/java/cc/shinichi/library/tool/common/DeviceUtil.kt | 0 settings.gradle | 2 bigimage_library/src/main/java/cc/shinichi/library/tool/file/SingleMediaScanner.kt | 0 bigimage_library/src/main/res/drawable-xxhdpi/icon_download_new.png | 0 bigimage_library/src/main/java/cc/shinichi/library/view/helper/DragCloseView.java | 0 bigimage_library/src/main/java/cc/shinichi/library/glide/cache/SafeKeyGenerator.kt | 0 bigimage_library/src/main/res/drawable/gray_square_circle_bg_white_stroke.xml | 0 bigimage_library/src/main/res/drawable-xxhdpi/ic_action_close.png | 0 bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/ImageViewState.java | 0 bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/decoder/CompatDecoderFactory.java | 0 bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/ImageSource.java | 0 bigimage_library/src/main/java/cc/shinichi/library/view/photoview/CustomGestureDetector.java | 0 bigimage_library/src/main/res/anim/scale_out.xml | 0 bigimage_library/src/main/java/cc/shinichi/library/view/listener/SimpleOnImageEventListener.kt | 0 105 files changed, 143 insertions(+), 17 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c28c784..1cef15e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -90,11 +90,12 @@ dependencies { implementation project(':expand_button') - implementation(project(':library')) + implementation implementation(project(':bigimage_library',)) implementation project(':date_time_picker') implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.8.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation "androidx.activity:activity-ktx:1.7.1" // testImplementation 'junit:junit:4.13.2' // androidTestImplementation 'androidx.test.ext:junit:1.1.5' // androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' diff --git a/app/src/main/java/com/dayu/pipirrapp/activity/OrderDetailActivity.java b/app/src/main/java/com/dayu/pipirrapp/activity/OrderDetailActivity.java index df93212..fe15c6c 100644 --- a/app/src/main/java/com/dayu/pipirrapp/activity/OrderDetailActivity.java +++ b/app/src/main/java/com/dayu/pipirrapp/activity/OrderDetailActivity.java @@ -45,7 +45,6 @@ import java.util.List; import java.util.Map; -import cc.shinichi.library.ImagePreview; import cc.shinichi.library.bean.ImageInfo; import cc.shinichi.library.bean.Type; diff --git a/app/src/main/java/com/dayu/pipirrapp/dao/AppDatabase.java b/app/src/main/java/com/dayu/pipirrapp/dao/AppDatabase.java index 6bf6421..5c40871 100644 --- a/app/src/main/java/com/dayu/pipirrapp/dao/AppDatabase.java +++ b/app/src/main/java/com/dayu/pipirrapp/dao/AppDatabase.java @@ -9,6 +9,7 @@ import com.dayu.pipirrapp.bean.db.InspectionLocationBean; import com.dayu.pipirrapp.bean.db.LoginBean; import com.dayu.pipirrapp.bean.db.MarkerBean; +import com.dayu.pipirrapp.bean.db.PipeNetworkBean; import com.dayu.pipirrapp.bean.db.TagBean; @@ -18,7 +19,7 @@ * Date: 2023-11-05 16:23 * Description: */ -@Database(entities = {DivideBean.class,InspectionBean.class,InspectionLocationBean.class, TagBean.class, LoginBean.class, CenterPointBean.class, MarkerBean.class}, version = 1, exportSchema = false) +@Database(entities = {PipeNetworkBean.class,DivideBean.class,InspectionBean.class,InspectionLocationBean.class, TagBean.class, LoginBean.class, CenterPointBean.class, MarkerBean.class}, version = 1, exportSchema = false) public abstract class AppDatabase extends RoomDatabase { @@ -36,4 +37,6 @@ public abstract DivideDao divideDao(); + public abstract PipeNetDao pipeNetDao(); + } diff --git a/app/src/main/java/com/dayu/pipirrapp/dao/PipeNetDao.java b/app/src/main/java/com/dayu/pipirrapp/dao/PipeNetDao.java new file mode 100644 index 0000000..2c2fa9f --- /dev/null +++ b/app/src/main/java/com/dayu/pipirrapp/dao/PipeNetDao.java @@ -0,0 +1,50 @@ +package com.dayu.pipirrapp.dao; + +import androidx.room.Delete; +import androidx.room.Insert; +import androidx.room.OnConflictStrategy; +import androidx.room.Query; +import androidx.room.Update; + +import com.dayu.pipirrapp.bean.db.PipeNetworkBean; + +import java.util.List; + +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.core.Single; + +/** + * 绠$綉鐩稿叧dao + */ +public interface PipeNetDao { + @Insert(onConflict = OnConflictStrategy.REPLACE) + void insert(PipeNetworkBean pipeNetworkBean); + + @Insert(onConflict = OnConflictStrategy.REPLACE) + Completable insertAll(List<PipeNetworkBean> pipeNetworkBeans); // 浣跨敤 Completable 杩涜寮傛鎻掑叆 + +// @Insert(onConflict = OnConflictStrategy.REPLACE) +// void insertAll(List<MarkerBean> markerBeans); // 浣跨敤 Completable 杩涜寮傛鎻掑叆 + + @Update + void update(PipeNetworkBean pipeNetworkBean); + + @Delete + void delete(PipeNetworkBean pipeNetworkBean); + + @Query("DELETE FROM PipeNetworkBean") + void deleteAll(); + + @Query("select * from PipeNetworkBean limit 1") + PipeNetworkBean findFirst(); + + @Query("select * from PipeNetworkBean") + List<PipeNetworkBean> findAll(); + + @Query("select * from PipeNetworkBean") + Single<List<PipeNetworkBean>> findAllToSingle(); + + @Query("SELECT * FROM PipeNetworkBean") + Maybe<List<PipeNetworkBean>> getAll(); +} diff --git a/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java b/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java index 7229bca..27486c3 100644 --- a/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java +++ b/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java @@ -5,11 +5,9 @@ import android.content.Context; import android.content.Intent; import android.content.res.Resources; -import android.graphics.drawable.Drawable; import android.os.Bundle; import android.text.TextUtils; import android.util.Log; -import android.util.Pair; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -42,7 +40,6 @@ import com.dayu.pipirrapp.bean.net.InspectionRequest; import com.dayu.pipirrapp.bean.net.MarkerListResult; import com.dayu.pipirrapp.bean.net.MarkerResult; -import com.dayu.pipirrapp.bean.net.PipeNetworkListResult; import com.dayu.pipirrapp.bean.net.PipeNetworkResult; import com.dayu.pipirrapp.dao.DaoSingleton; import com.dayu.pipirrapp.databinding.FragmentMapBinding; @@ -65,7 +62,6 @@ import com.dayu.pipirrapp.utils.WebViewUtils; import com.dayu.pipirrapp.view.ConfirmDialog; import com.dayu.pipirrapp.view.TipUtil; -import com.example.expand_button.ExpandButton; import com.hjq.permissions.OnPermissionCallback; import com.hjq.permissions.Permission; import com.hjq.permissions.XXPermissions; @@ -145,6 +141,7 @@ getCenterPoint(); getMarkerData(); getDivideList(); + getPipeNetworkList(); }); } @@ -237,6 +234,28 @@ for (DivideBean divide : divides) { divideBeanMap.put(divide.getId(), divide); setMapDivide(divide); + } + } + }, throwable -> { + Log.e(TAG, "Load divides error: " + throwable.getMessage()); + getDivideList(); + }, () -> { + // 褰揗aybe涓虹┖鏃惰皟鐢� + getDivideList(); + }) + ); + //寮傛鍔犺浇绠$綉鏁版嵁 + compositeDisposable.add( + DaoSingleton.getAsynchInstance(this.getContext()).pipeNetDao().getAll() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(pipeNetworkBeans -> { + if (pipeNetworkBeans == null || pipeNetworkBeans.isEmpty()) { + getPipeNetworkList(); + } else { + for (PipeNetworkBean pipeNetworkBean : pipeNetworkBeans) { + + } } }, throwable -> { @@ -1067,21 +1086,22 @@ * 鑾峰彇绠$綉 */ private void getPipeNetworkList() { - ApiManager.getInstance().requestGetHideLoading(MapFragment.this.getContext(), BASE_URL + "/project/network/all", PipeNetworkListResult.class, null, new SubscriberListener<BaseResponse<PipeNetworkListResult>>() { + ApiManager.getInstance().requestGetHideLoading(MapFragment.this.getContext(), BASE_URL + "/project/network/all", PipeNetworkResult.class, null, new SubscriberListener<BaseResponse<List<PipeNetworkResult>>>() { @Override - public void onNext(BaseResponse<PipeNetworkListResult> t) { + public void onNext(BaseResponse<List<PipeNetworkResult>> t) { try { if (t.isSuccess()) { - if (t.getContent().getObj() != null && !t.getContent().getObj().isEmpty()) { + if (t.getContent() != null && t.getContent().size() > 0) { - List<DivideBean> divideBeans = new ArrayList<>(); - for (PipeNetworkResult divideResult : t.getContent().getObj()) { - PipeNetworkBean divideBean = getPipeNetworkBean(divideResult); - setMapDivide(divideBean); -// divideBeans.add(divideBean); + List<PipeNetworkBean> pipeNetBeans = new ArrayList<>(); + PipeNetworkBean pipeNetBean = new PipeNetworkBean(); + for (PipeNetworkResult pipeNetworkResult : t.getContent()) { + pipeNetBean.setNetworkId(pipeNetworkResult.getNetworkId()); + pipeNetBean.setType(pipeNetworkResult.getType()); + pipeNetBean.setData(pipeNetworkResult.getData()); } // 浣跨敤 RxJava 寮傛鎻掑叆鏁版嵁 - DaoSingleton.getAsynchInstance(MapFragment.this.getContext()).divideDao().insertAll(divideBeans) + DaoSingleton.getAsynchInstance(MapFragment.this.getContext()).pipeNetDao().insertAll(pipeNetBeans) .subscribeOn(Schedulers.io()) // 鍦� IO 绾跨▼涓婃墽琛� .observeOn(AndroidSchedulers.mainThread()) // 鍦ㄤ富绾跨▼涓婅瀵� .subscribe(() -> { diff --git a/library/.gitignore b/bigimage_library/.gitignore similarity index 100% rename from library/.gitignore rename to bigimage_library/.gitignore diff --git a/library/build.gradle b/bigimage_library/build.gradle similarity index 96% rename from library/build.gradle rename to bigimage_library/build.gradle index 0e9fe2c..ceb9c0c 100644 --- a/library/build.gradle +++ b/bigimage_library/build.gradle @@ -23,6 +23,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') + compileOnly "androidx.activity:activity-ktx:1.7.1" compileOnly 'androidx.appcompat:appcompat:1.4.1' compileOnly 'com.google.android.material:material:1.5.0' compileOnly 'androidx.exifinterface:exifinterface:1.3.5' diff --git a/library/proguard-rules.pro b/bigimage_library/proguard-rules.pro similarity index 100% rename from library/proguard-rules.pro rename to bigimage_library/proguard-rules.pro diff --git a/library/src/main/AndroidManifest.xml b/bigimage_library/src/main/AndroidManifest.xml similarity index 100% rename from library/src/main/AndroidManifest.xml rename to bigimage_library/src/main/AndroidManifest.xml diff --git a/library/src/main/java/cc/shinichi/library/GlobalContext.kt b/bigimage_library/src/main/java/cc/shinichi/library/GlobalContext.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/GlobalContext.kt rename to bigimage_library/src/main/java/cc/shinichi/library/GlobalContext.kt diff --git a/library/src/main/java/cc/shinichi/library/ImagePreview.kt b/bigimage_library/src/main/java/cc/shinichi/library/ImagePreview.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/ImagePreview.kt rename to bigimage_library/src/main/java/cc/shinichi/library/ImagePreview.kt diff --git a/library/src/main/java/cc/shinichi/library/InitProvider.kt b/bigimage_library/src/main/java/cc/shinichi/library/InitProvider.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/InitProvider.kt rename to bigimage_library/src/main/java/cc/shinichi/library/InitProvider.kt diff --git a/library/src/main/java/cc/shinichi/library/bean/ImageInfo.kt b/bigimage_library/src/main/java/cc/shinichi/library/bean/ImageInfo.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/bean/ImageInfo.kt rename to bigimage_library/src/main/java/cc/shinichi/library/bean/ImageInfo.kt diff --git a/library/src/main/java/cc/shinichi/library/glide/FileTarget.kt b/bigimage_library/src/main/java/cc/shinichi/library/glide/FileTarget.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/glide/FileTarget.kt rename to bigimage_library/src/main/java/cc/shinichi/library/glide/FileTarget.kt diff --git a/library/src/main/java/cc/shinichi/library/glide/ImageLoader.kt b/bigimage_library/src/main/java/cc/shinichi/library/glide/ImageLoader.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/glide/ImageLoader.kt rename to bigimage_library/src/main/java/cc/shinichi/library/glide/ImageLoader.kt diff --git a/library/src/main/java/cc/shinichi/library/glide/SSLSocketClient.kt b/bigimage_library/src/main/java/cc/shinichi/library/glide/SSLSocketClient.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/glide/SSLSocketClient.kt rename to bigimage_library/src/main/java/cc/shinichi/library/glide/SSLSocketClient.kt diff --git a/library/src/main/java/cc/shinichi/library/glide/cache/DataCacheKey.kt b/bigimage_library/src/main/java/cc/shinichi/library/glide/cache/DataCacheKey.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/glide/cache/DataCacheKey.kt rename to bigimage_library/src/main/java/cc/shinichi/library/glide/cache/DataCacheKey.kt diff --git a/library/src/main/java/cc/shinichi/library/glide/cache/SafeKeyGenerator.kt b/bigimage_library/src/main/java/cc/shinichi/library/glide/cache/SafeKeyGenerator.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/glide/cache/SafeKeyGenerator.kt rename to bigimage_library/src/main/java/cc/shinichi/library/glide/cache/SafeKeyGenerator.kt diff --git a/library/src/main/java/cc/shinichi/library/glide/progress/OnProgressListener.kt b/bigimage_library/src/main/java/cc/shinichi/library/glide/progress/OnProgressListener.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/glide/progress/OnProgressListener.kt rename to bigimage_library/src/main/java/cc/shinichi/library/glide/progress/OnProgressListener.kt diff --git a/library/src/main/java/cc/shinichi/library/glide/progress/ProgressLibraryGlideModule.kt b/bigimage_library/src/main/java/cc/shinichi/library/glide/progress/ProgressLibraryGlideModule.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/glide/progress/ProgressLibraryGlideModule.kt rename to bigimage_library/src/main/java/cc/shinichi/library/glide/progress/ProgressLibraryGlideModule.kt diff --git a/library/src/main/java/cc/shinichi/library/glide/progress/ProgressManager.kt b/bigimage_library/src/main/java/cc/shinichi/library/glide/progress/ProgressManager.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/glide/progress/ProgressManager.kt rename to bigimage_library/src/main/java/cc/shinichi/library/glide/progress/ProgressManager.kt diff --git a/library/src/main/java/cc/shinichi/library/glide/progress/ProgressResponseBody.kt b/bigimage_library/src/main/java/cc/shinichi/library/glide/progress/ProgressResponseBody.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/glide/progress/ProgressResponseBody.kt rename to bigimage_library/src/main/java/cc/shinichi/library/glide/progress/ProgressResponseBody.kt diff --git a/library/src/main/java/cc/shinichi/library/tool/common/DeviceUtil.kt b/bigimage_library/src/main/java/cc/shinichi/library/tool/common/DeviceUtil.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/tool/common/DeviceUtil.kt rename to bigimage_library/src/main/java/cc/shinichi/library/tool/common/DeviceUtil.kt diff --git a/library/src/main/java/cc/shinichi/library/tool/common/HandlerHolder.kt b/bigimage_library/src/main/java/cc/shinichi/library/tool/common/HandlerHolder.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/tool/common/HandlerHolder.kt rename to bigimage_library/src/main/java/cc/shinichi/library/tool/common/HandlerHolder.kt diff --git a/library/src/main/java/cc/shinichi/library/tool/common/HttpUtil.kt b/bigimage_library/src/main/java/cc/shinichi/library/tool/common/HttpUtil.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/tool/common/HttpUtil.kt rename to bigimage_library/src/main/java/cc/shinichi/library/tool/common/HttpUtil.kt diff --git a/library/src/main/java/cc/shinichi/library/tool/common/NetworkUtil.kt b/bigimage_library/src/main/java/cc/shinichi/library/tool/common/NetworkUtil.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/tool/common/NetworkUtil.kt rename to bigimage_library/src/main/java/cc/shinichi/library/tool/common/NetworkUtil.kt diff --git a/library/src/main/java/cc/shinichi/library/tool/common/PhoneUtil.kt b/bigimage_library/src/main/java/cc/shinichi/library/tool/common/PhoneUtil.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/tool/common/PhoneUtil.kt rename to bigimage_library/src/main/java/cc/shinichi/library/tool/common/PhoneUtil.kt diff --git a/library/src/main/java/cc/shinichi/library/tool/common/SLog.kt b/bigimage_library/src/main/java/cc/shinichi/library/tool/common/SLog.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/tool/common/SLog.kt rename to bigimage_library/src/main/java/cc/shinichi/library/tool/common/SLog.kt diff --git a/library/src/main/java/cc/shinichi/library/tool/common/ToastUtil.kt b/bigimage_library/src/main/java/cc/shinichi/library/tool/common/ToastUtil.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/tool/common/ToastUtil.kt rename to bigimage_library/src/main/java/cc/shinichi/library/tool/common/ToastUtil.kt diff --git a/library/src/main/java/cc/shinichi/library/tool/common/UIUtil.kt b/bigimage_library/src/main/java/cc/shinichi/library/tool/common/UIUtil.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/tool/common/UIUtil.kt rename to bigimage_library/src/main/java/cc/shinichi/library/tool/common/UIUtil.kt diff --git a/library/src/main/java/cc/shinichi/library/tool/file/FileUtil.kt b/bigimage_library/src/main/java/cc/shinichi/library/tool/file/FileUtil.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/tool/file/FileUtil.kt rename to bigimage_library/src/main/java/cc/shinichi/library/tool/file/FileUtil.kt diff --git a/library/src/main/java/cc/shinichi/library/tool/file/SingleMediaScanner.kt b/bigimage_library/src/main/java/cc/shinichi/library/tool/file/SingleMediaScanner.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/tool/file/SingleMediaScanner.kt rename to bigimage_library/src/main/java/cc/shinichi/library/tool/file/SingleMediaScanner.kt diff --git a/library/src/main/java/cc/shinichi/library/tool/image/DownloadUtil.kt b/bigimage_library/src/main/java/cc/shinichi/library/tool/image/DownloadUtil.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/tool/image/DownloadUtil.kt rename to bigimage_library/src/main/java/cc/shinichi/library/tool/image/DownloadUtil.kt diff --git a/library/src/main/java/cc/shinichi/library/tool/image/ImageUtil.kt b/bigimage_library/src/main/java/cc/shinichi/library/tool/image/ImageUtil.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/tool/image/ImageUtil.kt rename to bigimage_library/src/main/java/cc/shinichi/library/tool/image/ImageUtil.kt diff --git a/library/src/main/java/cc/shinichi/library/view/HackyViewPager.kt b/bigimage_library/src/main/java/cc/shinichi/library/view/HackyViewPager.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/HackyViewPager.kt rename to bigimage_library/src/main/java/cc/shinichi/library/view/HackyViewPager.kt diff --git a/library/src/main/java/cc/shinichi/library/view/ImagePreviewActivity.kt b/bigimage_library/src/main/java/cc/shinichi/library/view/ImagePreviewActivity.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/ImagePreviewActivity.kt rename to bigimage_library/src/main/java/cc/shinichi/library/view/ImagePreviewActivity.kt diff --git a/library/src/main/java/cc/shinichi/library/view/ImagePreviewAdapter.kt b/bigimage_library/src/main/java/cc/shinichi/library/view/ImagePreviewAdapter.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/ImagePreviewAdapter.kt rename to bigimage_library/src/main/java/cc/shinichi/library/view/ImagePreviewAdapter.kt diff --git a/library/src/main/java/cc/shinichi/library/view/ImagePreviewFragment.kt b/bigimage_library/src/main/java/cc/shinichi/library/view/ImagePreviewFragment.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/ImagePreviewFragment.kt rename to bigimage_library/src/main/java/cc/shinichi/library/view/ImagePreviewFragment.kt diff --git a/library/src/main/java/cc/shinichi/library/view/helper/DragCloseView.java b/bigimage_library/src/main/java/cc/shinichi/library/view/helper/DragCloseView.java similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/helper/DragCloseView.java rename to bigimage_library/src/main/java/cc/shinichi/library/view/helper/DragCloseView.java diff --git a/library/src/main/java/cc/shinichi/library/view/listener/OnBigImageClickListener.kt b/bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnBigImageClickListener.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/listener/OnBigImageClickListener.kt rename to bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnBigImageClickListener.kt diff --git a/library/src/main/java/cc/shinichi/library/view/listener/OnBigImageLongClickListener.kt b/bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnBigImageLongClickListener.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/listener/OnBigImageLongClickListener.kt rename to bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnBigImageLongClickListener.kt diff --git a/library/src/main/java/cc/shinichi/library/view/listener/OnBigImagePageChangeListener.kt b/bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnBigImagePageChangeListener.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/listener/OnBigImagePageChangeListener.kt rename to bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnBigImagePageChangeListener.kt diff --git a/library/src/main/java/cc/shinichi/library/view/listener/OnCustomLayoutCallback.kt b/bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnCustomLayoutCallback.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/listener/OnCustomLayoutCallback.kt rename to bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnCustomLayoutCallback.kt diff --git a/library/src/main/java/cc/shinichi/library/view/listener/OnDownloadClickListener.kt b/bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnDownloadClickListener.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/listener/OnDownloadClickListener.kt rename to bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnDownloadClickListener.kt diff --git a/library/src/main/java/cc/shinichi/library/view/listener/OnDownloadListener.kt b/bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnDownloadListener.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/listener/OnDownloadListener.kt rename to bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnDownloadListener.kt diff --git a/library/src/main/java/cc/shinichi/library/view/listener/OnFinishListener.kt b/bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnFinishListener.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/listener/OnFinishListener.kt rename to bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnFinishListener.kt diff --git a/library/src/main/java/cc/shinichi/library/view/listener/OnOriginProgressListener.kt b/bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnOriginProgressListener.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/listener/OnOriginProgressListener.kt rename to bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnOriginProgressListener.kt diff --git a/library/src/main/java/cc/shinichi/library/view/listener/OnPageDragListener.kt b/bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnPageDragListener.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/listener/OnPageDragListener.kt rename to bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnPageDragListener.kt diff --git a/library/src/main/java/cc/shinichi/library/view/listener/OnPageFinishListener.kt b/bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnPageFinishListener.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/listener/OnPageFinishListener.kt rename to bigimage_library/src/main/java/cc/shinichi/library/view/listener/OnPageFinishListener.kt diff --git a/library/src/main/java/cc/shinichi/library/view/listener/SimpleOnImageEventListener.kt b/bigimage_library/src/main/java/cc/shinichi/library/view/listener/SimpleOnImageEventListener.kt similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/listener/SimpleOnImageEventListener.kt rename to bigimage_library/src/main/java/cc/shinichi/library/view/listener/SimpleOnImageEventListener.kt diff --git a/library/src/main/java/cc/shinichi/library/view/nine/AnimatorProxy.java b/bigimage_library/src/main/java/cc/shinichi/library/view/nine/AnimatorProxy.java similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/nine/AnimatorProxy.java rename to bigimage_library/src/main/java/cc/shinichi/library/view/nine/AnimatorProxy.java diff --git a/library/src/main/java/cc/shinichi/library/view/nine/ViewHelper.java b/bigimage_library/src/main/java/cc/shinichi/library/view/nine/ViewHelper.java similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/nine/ViewHelper.java rename to bigimage_library/src/main/java/cc/shinichi/library/view/nine/ViewHelper.java diff --git a/library/src/main/java/cc/shinichi/library/view/photoview/Compat.java b/bigimage_library/src/main/java/cc/shinichi/library/view/photoview/Compat.java similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/photoview/Compat.java rename to bigimage_library/src/main/java/cc/shinichi/library/view/photoview/Compat.java diff --git a/library/src/main/java/cc/shinichi/library/view/photoview/CustomGestureDetector.java b/bigimage_library/src/main/java/cc/shinichi/library/view/photoview/CustomGestureDetector.java similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/photoview/CustomGestureDetector.java rename to bigimage_library/src/main/java/cc/shinichi/library/view/photoview/CustomGestureDetector.java diff --git a/library/src/main/java/cc/shinichi/library/view/photoview/OnGestureListener.java b/bigimage_library/src/main/java/cc/shinichi/library/view/photoview/OnGestureListener.java similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/photoview/OnGestureListener.java rename to bigimage_library/src/main/java/cc/shinichi/library/view/photoview/OnGestureListener.java diff --git a/library/src/main/java/cc/shinichi/library/view/photoview/OnMatrixChangedListener.java b/bigimage_library/src/main/java/cc/shinichi/library/view/photoview/OnMatrixChangedListener.java similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/photoview/OnMatrixChangedListener.java rename to bigimage_library/src/main/java/cc/shinichi/library/view/photoview/OnMatrixChangedListener.java diff --git a/library/src/main/java/cc/shinichi/library/view/photoview/OnOutsidePhotoTapListener.java b/bigimage_library/src/main/java/cc/shinichi/library/view/photoview/OnOutsidePhotoTapListener.java similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/photoview/OnOutsidePhotoTapListener.java rename to bigimage_library/src/main/java/cc/shinichi/library/view/photoview/OnOutsidePhotoTapListener.java diff --git a/library/src/main/java/cc/shinichi/library/view/photoview/OnPhotoTapListener.java b/bigimage_library/src/main/java/cc/shinichi/library/view/photoview/OnPhotoTapListener.java similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/photoview/OnPhotoTapListener.java rename to bigimage_library/src/main/java/cc/shinichi/library/view/photoview/OnPhotoTapListener.java diff --git a/library/src/main/java/cc/shinichi/library/view/photoview/OnScaleChangedListener.java b/bigimage_library/src/main/java/cc/shinichi/library/view/photoview/OnScaleChangedListener.java similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/photoview/OnScaleChangedListener.java rename to bigimage_library/src/main/java/cc/shinichi/library/view/photoview/OnScaleChangedListener.java diff --git a/library/src/main/java/cc/shinichi/library/view/photoview/OnSingleFlingListener.java b/bigimage_library/src/main/java/cc/shinichi/library/view/photoview/OnSingleFlingListener.java similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/photoview/OnSingleFlingListener.java rename to bigimage_library/src/main/java/cc/shinichi/library/view/photoview/OnSingleFlingListener.java diff --git a/library/src/main/java/cc/shinichi/library/view/photoview/OnViewDragListener.java b/bigimage_library/src/main/java/cc/shinichi/library/view/photoview/OnViewDragListener.java similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/photoview/OnViewDragListener.java rename to bigimage_library/src/main/java/cc/shinichi/library/view/photoview/OnViewDragListener.java diff --git a/library/src/main/java/cc/shinichi/library/view/photoview/OnViewTapListener.java b/bigimage_library/src/main/java/cc/shinichi/library/view/photoview/OnViewTapListener.java similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/photoview/OnViewTapListener.java rename to bigimage_library/src/main/java/cc/shinichi/library/view/photoview/OnViewTapListener.java diff --git a/library/src/main/java/cc/shinichi/library/view/photoview/PhotoView.java b/bigimage_library/src/main/java/cc/shinichi/library/view/photoview/PhotoView.java similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/photoview/PhotoView.java rename to bigimage_library/src/main/java/cc/shinichi/library/view/photoview/PhotoView.java diff --git a/library/src/main/java/cc/shinichi/library/view/photoview/PhotoViewAttacher.java b/bigimage_library/src/main/java/cc/shinichi/library/view/photoview/PhotoViewAttacher.java similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/photoview/PhotoViewAttacher.java rename to bigimage_library/src/main/java/cc/shinichi/library/view/photoview/PhotoViewAttacher.java diff --git a/library/src/main/java/cc/shinichi/library/view/photoview/Util.java b/bigimage_library/src/main/java/cc/shinichi/library/view/photoview/Util.java similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/photoview/Util.java rename to bigimage_library/src/main/java/cc/shinichi/library/view/photoview/Util.java diff --git a/library/src/main/java/cc/shinichi/library/view/subsampling/ImageSource.java b/bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/ImageSource.java similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/subsampling/ImageSource.java rename to bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/ImageSource.java diff --git a/library/src/main/java/cc/shinichi/library/view/subsampling/ImageViewState.java b/bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/ImageViewState.java similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/subsampling/ImageViewState.java rename to bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/ImageViewState.java diff --git a/library/src/main/java/cc/shinichi/library/view/subsampling/SubsamplingScaleImageView.java b/bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/SubsamplingScaleImageView.java similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/subsampling/SubsamplingScaleImageView.java rename to bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/SubsamplingScaleImageView.java diff --git a/library/src/main/java/cc/shinichi/library/view/subsampling/decoder/CompatDecoderFactory.java b/bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/decoder/CompatDecoderFactory.java similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/subsampling/decoder/CompatDecoderFactory.java rename to bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/decoder/CompatDecoderFactory.java diff --git a/library/src/main/java/cc/shinichi/library/view/subsampling/decoder/DecoderFactory.java b/bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/decoder/DecoderFactory.java similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/subsampling/decoder/DecoderFactory.java rename to bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/decoder/DecoderFactory.java diff --git a/library/src/main/java/cc/shinichi/library/view/subsampling/decoder/ImageDecoder.java b/bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/decoder/ImageDecoder.java similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/subsampling/decoder/ImageDecoder.java rename to bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/decoder/ImageDecoder.java diff --git a/library/src/main/java/cc/shinichi/library/view/subsampling/decoder/ImageRegionDecoder.java b/bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/decoder/ImageRegionDecoder.java similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/subsampling/decoder/ImageRegionDecoder.java rename to bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/decoder/ImageRegionDecoder.java diff --git a/library/src/main/java/cc/shinichi/library/view/subsampling/decoder/SkiaImageDecoder.java b/bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/decoder/SkiaImageDecoder.java similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/subsampling/decoder/SkiaImageDecoder.java rename to bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/decoder/SkiaImageDecoder.java diff --git a/library/src/main/java/cc/shinichi/library/view/subsampling/decoder/SkiaImageRegionDecoder.java b/bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/decoder/SkiaImageRegionDecoder.java similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/subsampling/decoder/SkiaImageRegionDecoder.java rename to bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/decoder/SkiaImageRegionDecoder.java diff --git a/library/src/main/java/cc/shinichi/library/view/subsampling/decoder/SkiaPooledImageRegionDecoder.java b/bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/decoder/SkiaPooledImageRegionDecoder.java similarity index 100% rename from library/src/main/java/cc/shinichi/library/view/subsampling/decoder/SkiaPooledImageRegionDecoder.java rename to bigimage_library/src/main/java/cc/shinichi/library/view/subsampling/decoder/SkiaPooledImageRegionDecoder.java diff --git a/library/src/main/res/anim/fade_in.xml b/bigimage_library/src/main/res/anim/fade_in.xml similarity index 100% rename from library/src/main/res/anim/fade_in.xml rename to bigimage_library/src/main/res/anim/fade_in.xml diff --git a/library/src/main/res/anim/fade_out.xml b/bigimage_library/src/main/res/anim/fade_out.xml similarity index 100% rename from library/src/main/res/anim/fade_out.xml rename to bigimage_library/src/main/res/anim/fade_out.xml diff --git a/library/src/main/res/anim/scale_in.xml b/bigimage_library/src/main/res/anim/scale_in.xml similarity index 100% rename from library/src/main/res/anim/scale_in.xml rename to bigimage_library/src/main/res/anim/scale_in.xml diff --git a/library/src/main/res/anim/scale_out.xml b/bigimage_library/src/main/res/anim/scale_out.xml similarity index 100% rename from library/src/main/res/anim/scale_out.xml rename to bigimage_library/src/main/res/anim/scale_out.xml diff --git a/library/src/main/res/drawable-xhdpi/ic_action_close.png b/bigimage_library/src/main/res/drawable-xhdpi/ic_action_close.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/ic_action_close.png rename to bigimage_library/src/main/res/drawable-xhdpi/ic_action_close.png Binary files differ diff --git a/library/src/main/res/drawable-xhdpi/icon_change_orientation.png b/bigimage_library/src/main/res/drawable-xhdpi/icon_change_orientation.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/icon_change_orientation.png rename to bigimage_library/src/main/res/drawable-xhdpi/icon_change_orientation.png Binary files differ diff --git a/library/src/main/res/drawable-xhdpi/icon_download_new.png b/bigimage_library/src/main/res/drawable-xhdpi/icon_download_new.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/icon_download_new.png rename to bigimage_library/src/main/res/drawable-xhdpi/icon_download_new.png Binary files differ diff --git a/library/src/main/res/drawable-xhdpi/icon_video_play.png b/bigimage_library/src/main/res/drawable-xhdpi/icon_video_play.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/icon_video_play.png rename to bigimage_library/src/main/res/drawable-xhdpi/icon_video_play.png Binary files differ diff --git a/library/src/main/res/drawable-xhdpi/icon_video_stop.png b/bigimage_library/src/main/res/drawable-xhdpi/icon_video_stop.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/icon_video_stop.png rename to bigimage_library/src/main/res/drawable-xhdpi/icon_video_stop.png Binary files differ diff --git a/library/src/main/res/drawable-xhdpi/load_failed.png b/bigimage_library/src/main/res/drawable-xhdpi/load_failed.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/load_failed.png rename to bigimage_library/src/main/res/drawable-xhdpi/load_failed.png Binary files differ diff --git a/library/src/main/res/drawable-xxhdpi/ic_action_close.png b/bigimage_library/src/main/res/drawable-xxhdpi/ic_action_close.png similarity index 100% rename from library/src/main/res/drawable-xxhdpi/ic_action_close.png rename to bigimage_library/src/main/res/drawable-xxhdpi/ic_action_close.png Binary files differ diff --git a/library/src/main/res/drawable-xxhdpi/icon_change_orientation.png b/bigimage_library/src/main/res/drawable-xxhdpi/icon_change_orientation.png similarity index 100% rename from library/src/main/res/drawable-xxhdpi/icon_change_orientation.png rename to bigimage_library/src/main/res/drawable-xxhdpi/icon_change_orientation.png Binary files differ diff --git a/library/src/main/res/drawable-xxhdpi/icon_download_new.png b/bigimage_library/src/main/res/drawable-xxhdpi/icon_download_new.png similarity index 100% rename from library/src/main/res/drawable-xxhdpi/icon_download_new.png rename to bigimage_library/src/main/res/drawable-xxhdpi/icon_download_new.png Binary files differ diff --git a/library/src/main/res/drawable-xxhdpi/icon_video_play.png b/bigimage_library/src/main/res/drawable-xxhdpi/icon_video_play.png similarity index 100% rename from library/src/main/res/drawable-xxhdpi/icon_video_play.png rename to bigimage_library/src/main/res/drawable-xxhdpi/icon_video_play.png Binary files differ diff --git a/library/src/main/res/drawable-xxhdpi/icon_video_stop.png b/bigimage_library/src/main/res/drawable-xxhdpi/icon_video_stop.png similarity index 100% rename from library/src/main/res/drawable-xxhdpi/icon_video_stop.png rename to bigimage_library/src/main/res/drawable-xxhdpi/icon_video_stop.png Binary files differ diff --git a/library/src/main/res/drawable-xxhdpi/load_failed.png b/bigimage_library/src/main/res/drawable-xxhdpi/load_failed.png similarity index 100% rename from library/src/main/res/drawable-xxhdpi/load_failed.png rename to bigimage_library/src/main/res/drawable-xxhdpi/load_failed.png Binary files differ diff --git a/library/src/main/res/drawable/gray_circle_bg.xml b/bigimage_library/src/main/res/drawable/gray_circle_bg.xml similarity index 100% rename from library/src/main/res/drawable/gray_circle_bg.xml rename to bigimage_library/src/main/res/drawable/gray_circle_bg.xml diff --git a/library/src/main/res/drawable/gray_square_circle_bg_white_stroke.xml b/bigimage_library/src/main/res/drawable/gray_square_circle_bg_white_stroke.xml similarity index 100% rename from library/src/main/res/drawable/gray_square_circle_bg_white_stroke.xml rename to bigimage_library/src/main/res/drawable/gray_square_circle_bg_white_stroke.xml diff --git a/library/src/main/res/drawable/shape_indicator_bg.xml b/bigimage_library/src/main/res/drawable/shape_indicator_bg.xml similarity index 100% rename from library/src/main/res/drawable/shape_indicator_bg.xml rename to bigimage_library/src/main/res/drawable/shape_indicator_bg.xml diff --git a/library/src/main/res/layout/sh_default_progress_layout.xml b/bigimage_library/src/main/res/layout/sh_default_progress_layout.xml similarity index 100% rename from library/src/main/res/layout/sh_default_progress_layout.xml rename to bigimage_library/src/main/res/layout/sh_default_progress_layout.xml diff --git a/library/src/main/res/layout/sh_item_photoview.xml b/bigimage_library/src/main/res/layout/sh_item_photoview.xml similarity index 100% rename from library/src/main/res/layout/sh_item_photoview.xml rename to bigimage_library/src/main/res/layout/sh_item_photoview.xml diff --git a/library/src/main/res/layout/sh_layout_preview.xml b/bigimage_library/src/main/res/layout/sh_layout_preview.xml similarity index 100% rename from library/src/main/res/layout/sh_layout_preview.xml rename to bigimage_library/src/main/res/layout/sh_layout_preview.xml diff --git a/library/src/main/res/layout/sh_media_controller.xml b/bigimage_library/src/main/res/layout/sh_media_controller.xml similarity index 100% rename from library/src/main/res/layout/sh_media_controller.xml rename to bigimage_library/src/main/res/layout/sh_media_controller.xml diff --git a/library/src/main/res/values-en-rUS/strings.xml b/bigimage_library/src/main/res/values-en-rUS/strings.xml similarity index 100% rename from library/src/main/res/values-en-rUS/strings.xml rename to bigimage_library/src/main/res/values-en-rUS/strings.xml diff --git a/library/src/main/res/values/attrs.xml b/bigimage_library/src/main/res/values/attrs.xml similarity index 100% rename from library/src/main/res/values/attrs.xml rename to bigimage_library/src/main/res/values/attrs.xml diff --git a/library/src/main/res/values/ids.xml b/bigimage_library/src/main/res/values/ids.xml similarity index 100% rename from library/src/main/res/values/ids.xml rename to bigimage_library/src/main/res/values/ids.xml diff --git a/library/src/main/res/values/strings.xml b/bigimage_library/src/main/res/values/strings.xml similarity index 100% rename from library/src/main/res/values/strings.xml rename to bigimage_library/src/main/res/values/strings.xml diff --git a/library/src/main/res/values/style.xml b/bigimage_library/src/main/res/values/style.xml similarity index 100% rename from library/src/main/res/values/style.xml rename to bigimage_library/src/main/res/values/style.xml diff --git a/expand_button/src/main/java/com/example/expand_button/ExpandButton.kt b/expand_button/src/main/java/com/example/expand_button/ExpandButton.kt index 1ac7b29..3671c76 100644 --- a/expand_button/src/main/java/com/example/expand_button/ExpandButton.kt +++ b/expand_button/src/main/java/com/example/expand_button/ExpandButton.kt @@ -86,6 +86,14 @@ // 娣诲姞涓�涓睘鎬у畾涔変笁瑙掑舰鍥炬爣鐨勭偣鍑诲尯鍩熸墿灞曡寖鍥� private val triangleClickPadding: Float = 15f * context.resources.displayMetrics.density // 20dp + // 娣诲姞涓�涓爣璇嗙锛岀敤浜庡尯鍒嗕笉鍚岀殑 ExpandButton 瀹炰緥 + private var buttonId: String = "default" + + companion object { + private const val PREFS_NAME = "expand_button_prefs" + private const val KEY_LEGEND_STATES = "legend_states" + } + init { // 淇濆瓨 XML 涓缃殑榛樿瀛椾綋澶у皬 defaultTextSize = textSize @@ -485,6 +493,43 @@ } /** + * 璁剧疆鎸夐挳鐨勫敮涓�鏍囪瘑绗� + * @param id 鏍囪瘑绗� + */ + fun setButtonId(id: String) { + this.buttonId = id + // 鍔犺浇淇濆瓨鐨勭姸鎬� + loadStates() + } + + /** + * 淇濆瓨鎵�鏈夊浘渚嬮」鐨勭姸鎬� + */ + private fun saveStates() { + val prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE) + val states = legendItems.map { it.isSelected } + prefs.edit().putString("${KEY_LEGEND_STATES}_$buttonId", states.joinToString(",")).apply() + } + + /** + * 鍔犺浇淇濆瓨鐨勭姸鎬� + */ + private fun loadStates() { + val prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE) + val savedStates = prefs.getString("${KEY_LEGEND_STATES}_$buttonId", null) + + if (savedStates != null && legendItems.isNotEmpty()) { + val states = savedStates.split(",").map { it.toBoolean() } + states.forEachIndexed { index, state -> + if (index < legendItems.size) { + legendItems[index].isSelected = state + } + } + invalidate() + } + } + + /** * 璁剧疆鍥句緥鍐呭 */ @JvmName("setLegendsList") @@ -494,6 +539,9 @@ unselectedIcon.setBounds(0, 0, iconSize, iconSize) LegendItem(selectedIcon, unselectedIcon, description) } + + // 鍔犺浇淇濆瓨鐨勭姸鎬� + loadStates() if (!isExpanded) { text = collapsedText @@ -587,6 +635,10 @@ index, legendItems[index].isSelected ) + + // 淇濆瓨鐘舵�� + saveStates() + invalidate() } diff --git a/settings.gradle b/settings.gradle index 3a171c1..93c8acd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,5 @@ rootProject.name = "pipIrrApp" include ':app' include ':expand_button' -include ':library' +include ':bigimage_library' include ':date_time_picker' -- Gitblit v1.8.0