...

app/src/main/java/com/base/browserwhite/help/WeatherUtils.kt

@@ -15,6 +15,7 @@ import okhttp3.logging.HttpLoggingInterceptor
 import java.io.IOException
 import java.text.SimpleDateFormat
 import java.util.Calendar
+import java.util.concurrent.TimeUnit
 
 
 //object WeatherUtils {
@@ -170,6 +171,40 @@ object WeatherUtils {
         })
     }
 
+    /**
+     * 同步
+     */
+    fun getWeatherData() {
+        val client = OkHttpClient.Builder().apply {
+            if (BuildConfig.DEBUG) {
+                addInterceptor(HttpLoggingInterceptor().apply {
+                    level = HttpLoggingInterceptor.Level.BODY
+                })
+            }
+        }.connectTimeout(1, TimeUnit.SECONDS)
+            .readTimeout(1, TimeUnit.SECONDS)
+            .writeTimeout(1, TimeUnit.SECONDS)
+            .build()
+
+        val request = Request.Builder()
+            .url(url)
+            .get()
+            .build()
+        val response = client.newCall(request).execute()
+
+        response.body?.string()?.let {
+            val i = Regex("\"data\":\"(.*?)\"").find(it)
+            if (i.toString() != "null") {
+                i?.groupValues?.get(1).let {
+                    if (!TextUtils.isEmpty(it)) {
+                        val str = AESHelper.decrypt(it!!)
+                        saveWeatherData(str)
+                    }
+                }
+            }
+        }
+    }
+
     private fun saveWeatherData(string: String) {
         AppPreferences.getInstance().put(getTodayStr() + "_weather", string)
     }

app/src/main/java/com/base/browserwhite/ui/activity/splash/Splash2Activity.kt

@@ -73,23 +73,30 @@ class Splash2Activity : BaseActivity<ActivitySplash2Binding>(),
         closeNotification()
         mTaskManager = TaskManager(binding, this)
         if (ifAgreePrivacy) {
-            onAgreePrivacy()
+            startAnimation(true) {
+                onAgreePrivacy()
+            }
         } else {
-            PrivacyManager(binding, this, this)
+            startAnimation(false) {
+                PrivacyManager(binding, this, this)
+            }
         }
 
 
+    }
+
+    @SuppressLint("SetTextI18n")
+    fun startAnimation(isAgree: Boolean, callback: () -> Unit) {
         lifecycleScope.launch(Dispatchers.IO) {
 
             if (!WeatherUtils.hasWeatherDataToday()) {
-                WeatherUtils.requestWeatherData()
+                WeatherUtils.getWeatherData()
             }
 
             val weatherCityBean = WeatherUtils.getWeatherEntity()
             val weather = weatherCityBean?.list?.random()
             if (weather != null) {
 
-
                 launch(Dispatchers.Main) {
 
                     LogEx.logDebug(TAG, "weather 开始 ${weather.fxDate}")
@@ -110,13 +117,13 @@ class Splash2Activity : BaseActivity<ActivitySplash2Binding>(),
                     AnimationHelper.startAlphaAnimation(binding.ivWeather, 800) {
                         AnimationHelper.startAlphaAnimation(binding.tvDate, 800) {
                             AnimationHelper.startAlphaAnimation(binding.tvTemperature, 800) {
-                                if (ifAgreePrivacy) {
+                                if (isAgree) {
                                     AnimationHelper.startAlphaAnimation(binding.pb, 800) {
-
+                                        callback.invoke()
                                     }
                                 } else {
                                     AnimationHelper.startAlphaAnimation(binding.idTvStart, 800) {
-
+                                        callback.invoke()
                                     }
                                 }
 
@@ -129,8 +136,6 @@ class Splash2Activity : BaseActivity<ActivitySplash2Binding>(),
 
 
         }.start()
-
-
     }
 
     private fun closeNotification() {

app/src/main/java/com/base/browserwhite/ui/fragment/FileFragment.kt

@@ -142,10 +142,15 @@ class FileFragment : BaseFragment<FragmentFileBinding>() {
             binding.llPermission.visibility = View.GONE
             initData()
         } else {
+            simulateProgress()
             binding.llPermission.visibility = View.VISIBLE
         }
     }
 
+    private fun simulateProgress() {
+
+    }
+
     private fun initData() = lifecycleScope.launch(Dispatchers.IO) {
 
         val picturePair = requireContext().getMediaPhotoCountSize()