提交人：jtm

提交内容:烹饪左右滑动，下载菜谱解析失败

BusinessCommon/src/main/java/com/develop/common/utils/AppVersionUtil.kt

@@ -18,6 +18,7 @@ import com.develop.base.util.TopResumedAtyHolder
 import com.develop.common.data_repo.FoodDataProvider
 import com.develop.common.data_repo.db.entity.DevVersion
 import com.develop.common.data_repo.net.Api
+import com.develop.common.data_repo.net.converter.SerializationConverter.Companion.jsonDecoder
 import com.develop.common.data_repo.net.model.request.DeviceInfoBody
 import com.develop.common.data_repo.net.model.response.DevInfoResult
 import com.develop.common.data_repo.net.model.response.RecipeDataConfig
@@ -28,6 +29,7 @@ import com.drake.net.Post
 import com.drake.net.component.Progress
 import com.drake.net.interfaces.ProgressListener
 import com.drake.net.utils.scopeNetLife
+import kotlinx.serialization.decodeFromString
 import org.greenrobot.eventbus.EventBus
 import java.io.File
 import java.util.*
@@ -183,7 +185,7 @@ object AppVersionUtil {
                 return
             }
             val jsonContent = FileKit.readFileToString(jsonFile)
-            val contentData = jsonContent.fromJson() as RecipeDataConfig
+            val contentData = jsonDecoder.decodeFromString<RecipeDataConfig>(jsonContent)
             contentData.resetAllCodes()
             FoodDataProvider.getDatabase().runInTransaction {
                 FoodDataProvider.getDatabase().recipeDao().apply {

BusinessStep/src/main/res/layout/activity_cook_step_base.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_color"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:background="@color/bg_color">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_status_bar"
@@ -19,273 +18,280 @@
             android:layout_height="@dimen/convert_100px"
             android:background="@drawable/ic_cook_back"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent" />
 
         <View
             android:id="@+id/view_progress"
             android:layout_width="0dp"
             android:layout_height="@dimen/convert_12px"
-            app:layout_constraintStart_toEndOf="@+id/view_back"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"/>
+            app:layout_constraintStart_toEndOf="@+id/view_back" />
 
         <TextView
             android:id="@+id/tv_title_step"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:text="Step1:Peel 3 onions(180g)and2..."
+            android:layout_marginStart="@dimen/convert_70px"
+            android:layout_marginEnd="@dimen/convert_50px"
+            android:ellipsize="end"
             android:gravity="center"
+            android:maxLines="1"
+            android:text="Step1:Peel 3 onions(180g)and2..."
             android:textColor="#ffffff"
             android:textSize="@dimen/convert_30px"
-            android:maxLines="1"
-            android:ellipsize="end"
-            android:layout_marginStart="@dimen/convert_70px"
-            android:layout_marginEnd="@dimen/convert_50px"
-            app:layout_constraintStart_toEndOf="@+id/view_back"
-            app:layout_constraintEnd_toStartOf="@+id/view_alarm"/>
+            app:layout_constraintEnd_toStartOf="@+id/view_alarm"
+            app:layout_constraintStart_toEndOf="@+id/view_back" />
 
         <View
             android:id="@+id/view_alarm"
             android:layout_width="@dimen/convert_56px"
             android:layout_height="@dimen/convert_45px"
+            android:layout_marginTop="@dimen/convert_24px"
+            android:layout_marginEnd="@dimen/convert_33px"
             android:background="@drawable/ic_alarm"
             android:visibility="gone"
-            android:layout_marginEnd="@dimen/convert_33px"
-            android:layout_marginTop="@dimen/convert_24px"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
             android:id="@+id/view_note"
             android:layout_width="@dimen/convert_50px"
             android:layout_height="@dimen/convert_50px"
-            android:visibility="gone"
-            android:layout_marginEnd="@dimen/convert_33px"
             android:layout_marginTop="@dimen/convert_24px"
+            android:layout_marginEnd="@dimen/convert_33px"
+            android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <ImageView
-        android:id="@+id/iv_cook_bg"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:scaleType="centerCrop"
-        app:layout_constraintTop_toBottomOf="@+id/cl_status_bar"
-        app:layout_constraintBottom_toBottomOf="parent"/>
-
-    <View
+    <com.develop.common.widget.BCustomerLinearLayout
+        android:id="@+id/scroll_layout"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:background="@drawable/bg_cook_mask"
-        app:layout_constraintTop_toBottomOf="@+id/cl_status_bar"
-        app:layout_constraintBottom_toBottomOf="parent"/>
-
-
-    <ScrollView
-        android:layout_width="@dimen/convert_679px"
-        android:layout_height="@dimen/convert_500px"
-        android:layout_marginStart="@dimen/convert_40px"
-        android:layout_marginTop="@dimen/convert_40px"
-        android:layout_marginEnd="@dimen/convert_99px"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/cl_status_bar">
-
-        <TextView
-            android:id="@+id/tv_step_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:lineSpacingExtra="@dimen/convert_10px"
-            android:text="Step1:Peel 3 onions(180g)and2garlic cloves,halve the onions andput both in the blender jug."
-
-            android:textColor="#fff"
-            android:textSize="@dimen/convert_26px" />
-    </ScrollView>
-
-
-    <ImageView
-        android:id="@+id/iv_prev_step"
-        android:layout_width="@dimen/convert_90px"
-        android:layout_height="@dimen/convert_90px"
-        android:padding="@dimen/convert_15px"
-        android:src="@drawable/ic_cook_prev_step"
-        android:layout_marginStart="@dimen/convert_10px"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
-
-    <ImageView
-        android:id="@+id/iv_next_step"
-        android:padding="@dimen/convert_15px"
-        android:layout_width="@dimen/convert_90px"
-        android:layout_height="@dimen/convert_90px"
-        android:src="@drawable/ic_cook_next_step"
-        android:layout_marginEnd="@dimen/convert_10px"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
-
-    <include
-        android:id="@+id/controller"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        layout="@layout/item_cook_controller"
-        app:layout_constraintBottom_toBottomOf="parent"/>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/ll_weight_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent">
 
-        <TextView
-            android:id="@+id/tv_weight_num"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="#ffffff"
-            android:textSize="@dimen/convert_72px"
-            android:text="50g"
-            android:layout_marginBottom="@dimen/convert_42px"
-            android:includeFontPadding="false"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginEnd="@dimen/convert_310px"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toTopOf="@+id/weight_view"/>
-
-        <com.develop.common.widget.WeightView
-            android:id="@+id/weight_view"
-            android:layout_width="@dimen/convert_740px"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
-
-        <TextView
-            android:id="@+id/tv_weight_tare"
-            android:layout_width="@dimen/convert_197px"
-            android:layout_height="@dimen/convert_80px"
-            android:textColor="#ffffff"
-            android:textSize="@dimen/convert_36px"
-            android:text="@string/tare"
-            android:layout_marginEnd="@dimen/convert_270px"
-            android:gravity="center"
-            android:includeFontPadding="false"
-            android:layout_marginBottom="@dimen/convert_58px"
-            android:background="@drawable/bg_tare_button"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"/>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <ImageView
-        android:visibility="gone"
-        android:id="@+id/iv_turbo_view"
-        android:layout_width="@dimen/convert_170px"
-        android:layout_height="@dimen/convert_170px"
-        android:layout_marginTop="@dimen/convert_110px"
-        android:src="@drawable/ic_cook_crush"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/cl_status_bar"/>
-
-    <com.develop.common.widget.CircleBgImageView
-        android:id="@+id/view_change_crush"
-        android:layout_width="@dimen/convert_60px"
-        android:layout_height="@dimen/convert_60px"
-        android:layout_marginTop="@dimen/convert_40px"
-        android:layout_marginEnd="@dimen/convert_40px"
-        android:src="@drawable/ic_cooking_crush_small"
-        app:bgColor="@color/view_change"
-        android:padding="@dimen/convert_10px"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/cl_status_bar"/>
-
-    <com.develop.common.widget.CircleBgImageView
-        android:id="@+id/view_change_weight"
-        android:layout_width="@dimen/convert_60px"
-        android:layout_height="@dimen/convert_60px"
-        android:layout_marginTop="@dimen/convert_40px"
-        android:layout_marginEnd="@dimen/convert_40px"
-        android:src="@drawable/ic_cooking_weight"
-        app:bgColor="@color/view_change"
-        android:padding="@dimen/convert_10px"
-        app:layout_constraintEnd_toStartOf="@+id/view_change_crush"
-        app:layout_constraintTop_toBottomOf="@+id/cl_status_bar"/>
-
-    <com.develop.common.widget.CircleBgImageView
-        android:id="@+id/view_remark"
-        android:layout_width="@dimen/convert_60px"
-        android:layout_height="@dimen/convert_60px"
-        android:layout_marginTop="@dimen/convert_40px"
-        android:layout_marginEnd="@dimen/convert_40px"
-        android:src="@drawable/ic_cooking_remark"
-        android:padding="@dimen/convert_10px"
-        app:bgColor="@color/white"
-        app:layout_constraintEnd_toStartOf="@+id/view_change_weight"
-        app:layout_constraintTop_toBottomOf="@+id/cl_status_bar"/>
-
-    <LinearLayout
-        android:id="@+id/ll_step_finish"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:gravity="center_horizontal"
-        android:visibility="gone"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="@dimen/convert_100px">
-
-        <View
-            android:layout_width="@dimen/convert_152px"
-            android:layout_height="@dimen/convert_108px"
-            android:background="@drawable/ic_cook_finish"
-            android:layout_marginTop="@dimen/convert_123px"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/enjoy_your_meal"
-            android:textSize="@dimen/convert_48px"
-            android:textColor="@color/white"
-            android:layout_marginTop="@dimen/convert_49px"/>
-
-        <TextView
-            android:id="@+id/tv_cook_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Guacamole"
-            android:textSize="@dimen/convert_36px"
-            android:textColor="@color/white"
-            android:layout_marginTop="@dimen/convert_24px"/>
-
-        <com.develop.common.widget.CircleBgImageView
-            android:id="@+id/iv_add_to_fav"
-            android:layout_width="@dimen/convert_80px"
-            android:layout_height="@dimen/convert_80px"
-            android:src="@drawable/ic_cook_fav"
-            android:paddingHorizontal="@dimen/convert_19px"
-            android:paddingTop="@dimen/convert_24px"
-            android:paddingBottom="@dimen/convert_17px"
-            app:bgColor="@color/white"
-            android:layout_marginTop="@dimen/convert_24px"/>
-
-        <TextView
-            android:id="@+id/tv_add_to_fav"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Add to favourite"
-            android:textSize="@dimen/convert_30px"
-            android:textColor="@color/white"
-            android:layout_marginTop="@dimen/convert_24px"/>
-
-    </LinearLayout>
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <ImageView
+                android:id="@+id/iv_cook_bg"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:scaleType="centerCrop"
+                app:layout_constraintBottom_toBottomOf="parent" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:background="@drawable/bg_cook_mask"
+                app:layout_constraintBottom_toBottomOf="parent" />
+
+
+            <TextView
+                app:layout_constraintTop_toTopOf="parent"
+                android:id="@+id/tv_step_name"
+                android:layout_width="@dimen/convert_679px"
+                android:layout_height="0dp"
+                android:layout_marginStart="@dimen/convert_20px"
+                android:layout_marginTop="@dimen/convert_140px"
+                android:layout_marginEnd="@dimen/convert_99px"
+                android:layout_marginBottom="@dimen/convert_10px"
+                android:lineSpacingExtra="@dimen/convert_10px"
+                android:scrollbars="vertical"
+                android:text="Step1:Peel 3 onions(180g)and2garlic cloves,halve the onions andput both in the blender jug."
+                android:textColor="#fff"
+                android:textSize="@dimen/convert_26px"
+                app:layout_constraintBottom_toTopOf="@id/iv_prev_step"
+                app:layout_constraintStart_toStartOf="parent" />
+
+
+            <ImageView
+                android:id="@+id/iv_prev_step"
+                android:layout_width="@dimen/convert_90px"
+                android:layout_height="@dimen/convert_90px"
+                android:layout_marginStart="@dimen/convert_10px"
+                android:padding="@dimen/convert_15px"
+                android:src="@drawable/ic_cook_prev_step"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <ImageView
+                android:id="@+id/iv_next_step"
+                android:layout_width="@dimen/convert_90px"
+                android:layout_height="@dimen/convert_90px"
+                android:layout_marginEnd="@dimen/convert_10px"
+                android:padding="@dimen/convert_15px"
+                android:src="@drawable/ic_cook_next_step"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <include
+                android:id="@+id/controller"
+                layout="@layout/item_cook_controller"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:layout_constraintBottom_toBottomOf="parent" />
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/ll_weight_view"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="parent">
+
+                <TextView
+                    android:id="@+id/tv_weight_num"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginEnd="@dimen/convert_310px"
+                    android:layout_marginBottom="@dimen/convert_42px"
+                    android:includeFontPadding="false"
+                    android:text="50g"
+                    android:textColor="#ffffff"
+                    android:textSize="@dimen/convert_72px"
+                    app:layout_constraintBottom_toTopOf="@+id/weight_view"
+                    app:layout_constraintEnd_toEndOf="parent" />
+
+                <com.develop.common.widget.WeightView
+                    android:id="@+id/weight_view"
+                    android:layout_width="@dimen/convert_740px"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent" />
+
+                <TextView
+                    android:id="@+id/tv_weight_tare"
+                    android:layout_width="@dimen/convert_197px"
+                    android:layout_height="@dimen/convert_80px"
+                    android:layout_marginEnd="@dimen/convert_270px"
+                    android:layout_marginBottom="@dimen/convert_58px"
+                    android:background="@drawable/bg_tare_button"
+                    android:gravity="center"
+                    android:includeFontPadding="false"
+                    android:text="@string/tare"
+                    android:textColor="#ffffff"
+                    android:textSize="@dimen/convert_36px"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <ImageView
+                android:id="@+id/iv_turbo_view"
+                android:layout_width="@dimen/convert_170px"
+                android:layout_height="@dimen/convert_170px"
+                android:layout_marginTop="@dimen/convert_110px"
+                android:src="@drawable/ic_cook_crush"
+                android:visibility="gone"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <com.develop.common.widget.CircleBgImageView
+                android:id="@+id/view_change_crush"
+                android:layout_width="@dimen/convert_60px"
+                android:layout_height="@dimen/convert_60px"
+                android:layout_marginTop="@dimen/convert_140px"
+                android:layout_marginEnd="@dimen/convert_40px"
+                android:padding="@dimen/convert_10px"
+                android:src="@drawable/ic_cooking_crush_small"
+                app:bgColor="@color/view_change"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <com.develop.common.widget.CircleBgImageView
+                android:id="@+id/view_change_weight"
+                android:layout_width="@dimen/convert_60px"
+                android:layout_height="@dimen/convert_60px"
+                android:layout_marginTop="@dimen/convert_140px"
+                android:layout_marginEnd="@dimen/convert_40px"
+                android:padding="@dimen/convert_10px"
+                android:src="@drawable/ic_cooking_weight"
+                app:bgColor="@color/view_change"
+                app:layout_constraintEnd_toStartOf="@+id/view_change_crush"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <com.develop.common.widget.CircleBgImageView
+                android:id="@+id/view_remark"
+                android:layout_width="@dimen/convert_60px"
+                android:layout_height="@dimen/convert_60px"
+                android:layout_marginTop="@dimen/convert_140px"
+                android:layout_marginEnd="@dimen/convert_40px"
+                android:padding="@dimen/convert_10px"
+                android:src="@drawable/ic_cooking_remark"
+                app:bgColor="@color/white"
+                app:layout_constraintEnd_toStartOf="@+id/view_change_weight"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <LinearLayout
+                android:id="@+id/ll_step_finish"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/convert_100px"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                android:visibility="gone"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <View
+                    android:layout_width="@dimen/convert_152px"
+                    android:layout_height="@dimen/convert_108px"
+                    android:layout_marginTop="@dimen/convert_123px"
+                    android:background="@drawable/ic_cook_finish" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/convert_49px"
+                    android:text="@string/enjoy_your_meal"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/convert_48px" />
+
+                <TextView
+                    android:id="@+id/tv_cook_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/convert_24px"
+                    android:text="Guacamole"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/convert_36px" />
+
+                <com.develop.common.widget.CircleBgImageView
+                    android:id="@+id/iv_add_to_fav"
+                    android:layout_width="@dimen/convert_80px"
+                    android:layout_height="@dimen/convert_80px"
+                    android:layout_marginTop="@dimen/convert_24px"
+                    android:paddingHorizontal="@dimen/convert_19px"
+                    android:paddingTop="@dimen/convert_24px"
+                    android:paddingBottom="@dimen/convert_17px"
+                    android:src="@drawable/ic_cook_fav"
+                    app:bgColor="@color/white" />
+
+                <TextView
+                    android:id="@+id/tv_add_to_fav"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/convert_24px"
+                    android:text="Add to favourite"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/convert_30px" />
+
+            </LinearLayout>
+
+            <FrameLayout
+                android:id="@+id/fl_cook_details"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                app:layout_constraintBottom_toBottomOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </com.develop.common.widget.BCustomerLinearLayout>
 
-    <FrameLayout
-        android:id="@+id/fl_cook_details"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintTop_toBottomOf="@+id/cl_status_bar"
-        app:layout_constraintBottom_toBottomOf="parent"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:sharedUserId="android.uid.system"
+
     package="com.develop.foodcooking">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />

app/src/main/java/com/develop/foodcooking/FoodCookingApp.kt

@@ -86,13 +86,13 @@ class FoodCookingApp : BaseApp() {
         if (minute == 0) {
             minute = 5
         }
-        Settings.System.putInt(
-            contentResolver,
-            Settings.System.SCREEN_OFF_TIMEOUT,
-            (1000 * 60 * minute).toInt()
-        )
-
-        Settings.Secure.putInt(contentResolver, Settings.Secure.INSTALL_NON_MARKET_APPS, 1)
+//        Settings.System.putInt(
+//            contentResolver,
+//            Settings.System.SCREEN_OFF_TIMEOUT,
+//            (1000 * 60 * minute).toInt()
+//        )
+//
+//        Settings.Secure.putInt(contentResolver, Settings.Secure.INSTALL_NON_MARKET_APPS, 1)
 
         val uri: Uri = Settings.System
             .getUriFor(Settings.System.SCREEN_OFF_TIMEOUT)