Merge branch 'master' of http://git.wmzhubo.com/guadoutech/PartTimeJob_CN_Android

cpt_main/src/main/java/com/hongyegroup/cpt_main/ui/HomeFragment.kt

@@ -45,7 +45,6 @@ class HomeFragment : YYBaseVDBLoadingFragment<HomeViewModel, FragmentHomeBinding
     }
 
     override fun init(savedInstanceState: Bundle?) {
-
         initRV()
         initData()
         initListener()

cpt_parttime/src/main/java/com/hongyegroup/cpt_parttime/adapter/GroomingAdapter.kt

@@ -7,7 +7,7 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.viewholder.BaseViewHolder
-import com.guadou.lib_baselib.engine.extDownloadImage
+import com.guadou.lib_baselib.engine.image_load.extDownloadImage
 import com.guadou.lib_baselib.ext.checkEmpty
 import com.guadou.lib_baselib.utils.CommUtils
 import com.hongyegroup.cpt_parttime.R

cpt_parttime/src/main/java/com/hongyegroup/cpt_parttime/adapter/How2ReportAdapter.kt

@@ -6,7 +6,7 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.viewholder.BaseViewHolder
-import com.guadou.lib_baselib.engine.extLoad
+import com.guadou.lib_baselib.engine.image_load.extLoad
 import com.guadou.lib_baselib.ext.checkEmpty
 import com.guadou.lib_baselib.utils.CommUtils
 import com.hongyegroup.cpt_parttime.R

cpt_parttime/src/main/java/com/hongyegroup/cpt_parttime/ui/activity/PartJobAlbumActivity.kt

@@ -7,8 +7,8 @@ import androidx.recyclerview.widget.RecyclerView
 import com.guadou.cs_cptservices.base.activity.YYBaseVDBActivity
 import com.guadou.lib_baselib.base.vm.EmptyViewModel
 import com.guadou.lib_baselib.bean.DataBindingConfig
-import com.guadou.lib_baselib.engine.ImagePreviewUtils
-import com.guadou.lib_baselib.engine.extLoad
+import com.guadou.lib_baselib.engine.image_load.ImagePreviewUtils
+import com.guadou.lib_baselib.engine.image_load.extLoad
 import com.guadou.lib_baselib.ext.click
 import com.guadou.lib_baselib.ext.commContext
 import com.guadou.lib_baselib.ext.gotoActivity

cs_baselib/src/main/AndroidManifest.xml

@@ -47,7 +47,7 @@
 
         <!--   7.1系统Uri适配     -->
         <provider
-            android:name="com.guadou.lib_baselib.provider.PermissionFileProvider"
+            android:name="com.guadou.lib_baselib.engine.permission.PermissionFileProvider"
             android:authorities="${applicationId}.file.path.share"
             android:exported="false"
             android:grantUriPermissions="true">

cs_baselib/src/main/java/com/guadou/lib_baselib/engine/ImagePreviewUtils.kt

@@ -1,4 +1,4 @@
-package com.guadou.lib_baselib.engine
+package com.guadou.lib_baselib.engine.image_load
 
 import android.content.Context
 import android.widget.ImageView

cs_baselib/src/main/java/com/guadou/lib_baselib/engine/ImageViewExt.kt

@@ -1,4 +1,4 @@
-package com.guadou.lib_baselib.engine
+package com.guadou.lib_baselib.engine.image_load
 
 import android.annotation.SuppressLint
 import android.content.Context

cs_baselib/src/main/java/com/guadou/lib_baselib/engine/PermissionExt.kt

@@ -1,20 +1,17 @@
-package com.guadou.lib_baselib.engine
+package com.guadou.lib_baselib.engine.permission
 
 import android.app.Activity
 import android.content.Context
-import android.net.Uri
 import android.os.Build
-import androidx.core.content.FileProvider
 import androidx.fragment.app.Fragment
 import com.guadou.basiclib.R
+import com.guadou.lib_baselib.engine.toast
 import com.guadou.lib_baselib.view.FangIOSDialog
 import com.hjq.permissions.IPermissionInterceptor
 import com.hjq.permissions.OnPermissionCallback
 import com.hjq.permissions.Permission
 import com.hjq.permissions.XXPermissions
-import java.io.File
-import java.lang.StringBuilder
-import java.util.ArrayList
+import java.util.*
 
 /**
  * 申请权限的引擎类

cs_baselib/src/main/java/com/guadou/lib_baselib/provider/PermissionFileProvider.java

@@ -13,7 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.guadou.lib_baselib.provider;
+package com.guadou.lib_baselib.engine.permission;
+
+import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
+import static org.xmlpull.v1.XmlPullParser.START_TAG;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
@@ -39,13 +42,10 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
-import static org.xmlpull.v1.XmlPullParser.START_TAG;
-
 /**
  * 设置自定义的Provider,兼容7.1 Uri系统
  */
-public class PermissionFileProvider extends ContentProvider {
+class PermissionFileProvider extends ContentProvider {
 
     private static final String[] COLUMNS = {OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE};
 

cs_baselib/src/main/java/com/guadou/lib_baselib/engine/permission/UriExt.kt

@@ -0,0 +1,14 @@
+package com.guadou.lib_baselib.engine.permission
+
+import android.net.Uri
+import android.os.Build
+import com.guadou.lib_baselib.ext.commContext
+import java.io.File
+
+
+fun Any.getFileUri(file: File): Uri {
+
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+        PermissionFileProvider.getUriForFile(commContext(), commContext().packageName + ".file.path.share", file)
+    } else Uri.fromFile(file)
+}

cs_baselib/src/main/java/com/guadou/lib_baselib/utils/DataStoreUtils.kt

@@ -1,4 +1,4 @@
-package com.guadou.lib_baselib.utils
+package com.guadou.lib_baselib.engine.sp
 
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.*
@@ -11,7 +11,7 @@ import kotlinx.coroutines.runBlocking
 /**
  * DataStore的存取工具类
  */
-object DataStoreUtils {
+internal object DataStoreUtils {
 
     private val BaseApplication.dataStore: DataStore<Preferences> by preferencesDataStore(name = "app_config")
 
@@ -54,9 +54,11 @@ object DataStoreUtils {
     /**
      * 清空数据
      */
-    fun clearData() = runBlocking { dataStore.edit {
-        it.clear()
-    } }
+    fun clearData() = runBlocking {
+        dataStore.edit {
+            it.clear()
+        }
+    }
 
     /**
      * 存放Int数据

cs_baselib/src/main/java/com/guadou/lib_baselib/engine/SPExt.kt

@@ -2,7 +2,7 @@ package com.guadou.lib_baselib.engine
 
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
-import com.guadou.lib_baselib.utils.DataStoreUtils
+import com.guadou.lib_baselib.engine.sp.DataStoreUtils
 
 
 /**

cs_baselib/src/main/res/values/strings.xml

@@ -1,4 +1,4 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!--  网络请求的错误提示  -->
     <string name="no">否</string>
     <string name="Ok">是</string>
@@ -15,20 +15,6 @@
     <string name="error_domain_name">无法连接服务器，请稍后再试</string>
     <string name="error_unknown">出错了，未知异常</string>
 
-    <!-- LoadingView的错误提示 -->
-<!--    <string name="error_view_click_to_refresh">Click to Refresh</string>-->
-<!--    <string name="error_view_no_data">you don\'t have any record yet</string>-->
-<!--    <string name="error_view_loading">Loading…</string>-->
-<!--    <string name="error_view_load_error_click_to_refresh">you don\'t have any record yet</string>-->
-<!--    <string name="error_view_network_error_click_to_refresh">Network Error</string>-->
-<!--    <string name="tip_network_error">Network connection error, please check the network connection</string>-->
-<!--    <string name="network_alert">Network Alert</string>-->
-<!--    <string name="is_goto_setting">Network connection error,Are you sure goto setting?</string>-->
-<!--    <string name="setting">Setting</string>-->
-<!--    <string name="cancel">Cancel</string>-->
-<!--    <string name="load_more_finish">Load Success</string>-->
-<!--    <string name="no_more_data">No More Data.</string>-->
-
     <!--  XPermission的权限错误提示文本  -->
     <string name="common_permission_hint">授权提示</string>
     <string name="common_permission_message">使用此功能需要先授予权限</string>

cs_cptServices/src/main/java/com/guadou/cs_cptservices/adapter/BannerGlobalAdapter.kt

@@ -4,8 +4,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.recyclerview.widget.RecyclerView
-import com.guadou.lib_baselib.engine.extLoad
-import com.guadou.lib_baselib.engine.extLoadGif
+import com.guadou.lib_baselib.engine.image_load.extLoad
+import com.guadou.lib_baselib.engine.image_load.extLoadGif
 import com.guadou.lib_baselib.ext.checkExtEmpty
 import com.youth.banner.adapter.BannerAdapter
 

cs_cptServices/src/main/java/com/guadou/cs_cptservices/binding/BindingImageView.kt

@@ -4,7 +4,7 @@ import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
 import android.widget.ImageView
 import androidx.databinding.BindingAdapter
-import com.guadou.lib_baselib.engine.extLoad
+import com.guadou.lib_baselib.engine.image_load.extLoad
 import com.guadou.lib_baselib.utils.CommUtils
 
 /**

cs_ninegrid/src/main/java/com/guadou/ninegrid/NineGlideLoader.kt

@@ -3,8 +3,8 @@ package com.guadou.ninegrid
 import android.annotation.SuppressLint
 import android.content.Context
 import android.widget.ImageView
-import com.guadou.lib_baselib.engine.extLoad
-import com.guadou.lib_baselib.engine.extLoadGif
+import com.guadou.lib_baselib.engine.image_load.extLoad
+import com.guadou.lib_baselib.engine.image_load.extLoadGif
 import com.guadou.lib_baselib.ext.checkEmpty
 
 /**

cs_ninegrid/src/main/java/com/guadou/ninegrid/nine_grid_layout/SimpleImageViewNineGrid.kt

@@ -4,7 +4,7 @@ import android.app.Activity
 import android.content.Context
 import android.util.AttributeSet
 import android.widget.ImageView
-import com.guadou.lib_baselib.engine.ImagePreviewUtils
+import com.guadou.lib_baselib.engine.image_load.ImagePreviewUtils
 import com.guadou.lib_baselib.ext.click
 import com.guadou.ninegrid.ImageInfo
 import com.guadou.ninegrid.ImageLoader

cs_ninegrid/src/main/java/com/guadou/ninegrid/zipimg/ZipGridView.kt

@@ -5,7 +5,7 @@ import android.util.AttributeSet
 import android.view.Gravity
 import android.widget.FrameLayout
 import android.widget.ImageView
-import com.guadou.lib_baselib.engine.extLoad
+import com.guadou.lib_baselib.engine.image_load.extLoad
 import com.guadou.ninegrid.R
 import com.guadou.ninegrid.roundimg.NiceUtils
 import java.util.*