Browse Source

修复大图导致oom的问题

Frankensteinly 10 months ago
parent
commit
8848e98d2f

+ 11 - 0
app/src/main/java/com/grkj/iscs/presentation/simple/SimpleProcessActivity.kt

@@ -5,6 +5,7 @@ import android.view.InputDevice
 import android.view.KeyEvent
 import android.view.View
 import androidx.core.content.ContextCompat
+import com.bumptech.glide.Glide
 import com.google.gson.Gson
 import com.grkj.iscs.BusinessManager
 import com.grkj.iscs.R
@@ -31,6 +32,16 @@ class SimpleProcessActivity : BaseActivity<ActivitySimpleProcessBinding>() {
         get() = ActivitySimpleProcessBinding.inflate(layoutInflater)
 
     override fun initView() {
+        Glide.with(this).load(R.mipmap.settings).into(mBinding!!.ivSettings)
+        Glide.with(this).load(R.mipmap.shared).into(mBinding!!.ivShared1)
+        Glide.with(this).load(R.mipmap.shared).into(mBinding!!.ivShared2)
+        Glide.with(this).load(R.mipmap.confirm).into(mBinding!!.ivConfirm1)
+        Glide.with(this).load(R.mipmap.confirm).into(mBinding!!.ivConfirm2)
+        Glide.with(this).load(R.mipmap.home).into(mBinding!!.ivHome)
+        Glide.with(this).load(R.mipmap.waiting).into(mBinding!!.ivWaiting1)
+        Glide.with(this).load(R.mipmap.waiting).into(mBinding!!.ivWaiting2)
+        Glide.with(this).load(R.mipmap.permit).into(mBinding!!.ivPermit)
+
         mStepList = mutableListOf(mBinding!!.llContainer0, mBinding!!.llContainer1,
             mBinding!!.llContainer2, mBinding!!.llContainer3, mBinding!!.llContainer4,
             mBinding!!.llContainer5, mBinding!!.llContainer6, mBinding!!.llContainer7)

+ 9 - 0
app/src/main/java/com/grkj/iscs/presentation/simple/SimpleSettingActivity.kt

@@ -1,6 +1,7 @@
 package com.grkj.iscs.presentation.simple
 
 import android.content.Intent
+import com.bumptech.glide.Glide
 import com.grkj.iscs.R
 import com.grkj.iscs.base.BaseActivity
 import com.grkj.iscs.databinding.ActivitySimpleSettingBinding
@@ -15,6 +16,14 @@ class SimpleSettingActivity : BaseActivity<ActivitySimpleSettingBinding>() {
         get() = ActivitySimpleSettingBinding.inflate(layoutInflater)
 
     override fun initView() {
+        Glide.with(this).load(R.mipmap.settings).into(mBinding!!.ivSetting)
+        Glide.with(this).load(R.mipmap.home).into(mBinding!!.ivHome)
+        Glide.with(this).load(R.mipmap.switch_on).into(mBinding!!.ivOn1)
+        Glide.with(this).load(R.mipmap.switch_on).into(mBinding!!.ivOn2)
+        Glide.with(this).load(R.mipmap.switch_off).into(mBinding!!.ivOff1)
+        Glide.with(this).load(R.mipmap.switch_off).into(mBinding!!.ivOff2)
+        Glide.with(this).load(R.mipmap.reset).into(mBinding!!.ivReset)
+
         mBinding?.llFinishTicket?.debounce {
             PresentationManager.initTicket()
             ToastUtils.tip(R.string.simple_ticket_tip)

+ 8 - 10
app/src/main/res/layout/activity_simple_process.xml

@@ -35,9 +35,9 @@
             style="@style/SimpleBtnContainer">
 
             <ImageView
+                android:id="@+id/iv_permit"
                 android:layout_width="@dimen/simple_icon_size"
-                android:layout_height="@dimen/simple_icon_size"
-                android:background="@mipmap/permit"/>
+                android:layout_height="@dimen/simple_icon_size"/>
             <TextView
                 android:id="@+id/tv_execute"
                 style="@style/SimpleTextView"
@@ -93,9 +93,9 @@
             style="@style/SimpleBtnContainer">
 
             <ImageView
+                android:id="@+id/iv_confirm2"
                 android:layout_width="@dimen/simple_icon_size"
                 android:layout_height="@dimen/simple_icon_size"
-                android:background="@mipmap/confirm"
                 />
 
             <TextView
@@ -151,9 +151,9 @@
             style="@style/SimpleBtnContainer">
 
             <ImageView
+                android:id="@+id/iv_waiting1"
                 android:layout_width="@dimen/simple_icon_size"
                 android:layout_height="@dimen/simple_icon_size"
-                android:background="@mipmap/waiting"
                 />
 
             <TextView
@@ -215,7 +215,6 @@
                 android:id="@+id/iv_shared1"
                 android:layout_width="@dimen/simple_icon_size"
                 android:layout_height="@dimen/simple_icon_size"
-                android:background="@mipmap/shared"
                 />
 
             <TextView
@@ -277,7 +276,6 @@
                 android:id="@+id/iv_shared2"
                 android:layout_width="@dimen/simple_icon_size"
                 android:layout_height="@dimen/simple_icon_size"
-                android:background="@mipmap/shared"
                 />
 
             <TextView
@@ -332,9 +330,9 @@
             android:id="@+id/ll_confirm_complete"
             style="@style/SimpleBtnContainer">
             <ImageView
+                android:id="@+id/iv_confirm1"
                 android:layout_width="@dimen/simple_icon_size"
                 android:layout_height="@dimen/simple_icon_size"
-                android:background="@mipmap/confirm"
                 />
 
             <TextView
@@ -390,9 +388,9 @@
             style="@style/SimpleBtnContainer"
             android:background="#00FFFFFF">
             <ImageView
+                android:id="@+id/iv_waiting2"
                 android:layout_width="@dimen/simple_icon_size"
                 android:layout_height="@dimen/simple_icon_size"
-                android:background="@mipmap/waiting"
                 />
 
             <TextView
@@ -432,9 +430,9 @@
         style="@style/SimpleBtnContainer"
         android:layout_alignParentBottom="true">
         <ImageView
+            android:id="@+id/iv_home"
             android:layout_width="@dimen/simple_icon_size"
             android:layout_height="@dimen/simple_icon_size"
-            android:background="@mipmap/home"
             />
         <TextView
             style="@style/SimpleTextView"
@@ -447,9 +445,9 @@
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true">
         <ImageView
+            android:id="@+id/iv_settings"
             android:layout_width="@dimen/simple_icon_size"
             android:layout_height="@dimen/simple_icon_size"
-            android:background="@mipmap/settings"
             />
         <TextView
             style="@style/SimpleTextView"

+ 14 - 14
app/src/main/res/layout/activity_simple_setting.xml

@@ -13,10 +13,10 @@
         android:layout_alignParentBottom="true">
 
         <ImageView
+            android:id="@+id/iv_home"
             android:layout_width="@dimen/simple_icon_size"
             android:layout_height="@dimen/simple_icon_size"
-            android:layout_marginRight="5dp"
-            android:background="@mipmap/home" />
+            android:layout_marginRight="5dp" />
 
         <TextView
             style="@style/SimpleTextView"
@@ -30,10 +30,10 @@
         android:layout_alignParentBottom="true">
 
         <ImageView
+            android:id="@+id/iv_setting"
             android:layout_width="@dimen/simple_icon_size"
             android:layout_height="@dimen/simple_icon_size"
-            android:layout_marginRight="5dp"
-            android:background="@mipmap/settings" />
+            android:layout_marginRight="5dp" />
 
         <TextView
             style="@style/SimpleTextView"
@@ -70,10 +70,10 @@
                 android:layout_width="200dp">
 
                 <ImageView
+                    android:id="@+id/iv_on1"
                     android:layout_width="@dimen/simple_icon_size"
                     android:layout_height="@dimen/simple_icon_size"
-                    android:layout_marginRight="5dp"
-                    android:background="@mipmap/switch_on" />
+                    android:layout_marginRight="5dp" />
 
                 <TextView
                     style="@style/SimpleTextView"
@@ -86,10 +86,10 @@
                 android:layout_width="200dp">
 
                 <ImageView
+                    android:id="@+id/iv_on2"
                     android:layout_width="@dimen/simple_icon_size"
                     android:layout_height="@dimen/simple_icon_size"
-                    android:layout_marginRight="5dp"
-                    android:background="@mipmap/switch_on" />
+                    android:layout_marginRight="5dp" />
 
                 <TextView
                     style="@style/SimpleTextView"
@@ -109,10 +109,10 @@
                 android:layout_width="200dp">
 
                 <ImageView
+                    android:id="@+id/iv_off1"
                     android:layout_width="@dimen/simple_icon_size"
                     android:layout_height="@dimen/simple_icon_size"
-                    android:layout_marginRight="5dp"
-                    android:background="@mipmap/switch_off" />
+                    android:layout_marginRight="5dp" />
 
                 <TextView
                     style="@style/SimpleTextView"
@@ -126,10 +126,10 @@
                 android:layout_width="200dp">
 
                 <ImageView
+                    android:id="@+id/iv_off2"
                     android:layout_width="@dimen/simple_icon_size"
                     android:layout_height="@dimen/simple_icon_size"
-                    android:layout_marginRight="5dp"
-                    android:background="@mipmap/switch_off" />
+                    android:layout_marginRight="5dp" />
 
                 <TextView
                     style="@style/SimpleTextView"
@@ -145,10 +145,10 @@
             android:layout_width="200dp">
 
             <ImageView
+                android:id="@+id/iv_reset"
                 android:layout_width="@dimen/simple_icon_size"
                 android:layout_height="@dimen/simple_icon_size"
-                android:layout_marginRight="5dp"
-                android:background="@mipmap/reset" />
+                android:layout_marginRight="5dp" />
 
             <TextView
                 style="@style/SimpleTextView"

BIN
app/src/main/res/mipmap/confirm.png


BIN
app/src/main/res/mipmap/home.png


BIN
app/src/main/res/mipmap/login_bg.png


BIN
app/src/main/res/mipmap/permit.png


BIN
app/src/main/res/mipmap/process_bg.png


BIN
app/src/main/res/mipmap/reset.png


BIN
app/src/main/res/mipmap/settings.png


BIN
app/src/main/res/mipmap/shared.png


BIN
app/src/main/res/mipmap/switch_off.png


BIN
app/src/main/res/mipmap/switch_on.png


BIN
app/src/main/res/mipmap/waiting.png