Browse Source

去除glide加载本地的方法

Shangyp 5 months ago
parent
commit
dfbc70decf

+ 4 - 12
app/src/main/java/com/hanghui/senic/activity/DevelopActivity.java

@@ -51,27 +51,19 @@ public class DevelopActivity extends Activity {
             }
         });
         if (DevelopUtil.isScreenLogOpen){
-            Glide.with(DevelopActivity.this)
-                    .load(R.mipmap.swich_open)
-                    .into(tv_screenLogSwitch_isOpen);
+            tv_screenLogSwitch_isOpen.setImageResource(R.mipmap.swich_open);
         }else {
-            Glide.with(DevelopActivity.this)
-                    .load(R.mipmap.swich_close)
-                    .into(tv_screenLogSwitch_isOpen);
+            tv_screenLogSwitch_isOpen.setImageResource(R.mipmap.swich_close);
         }
     }
 
     private void setOpenLog() {
         if (DevelopUtil.isScreenLogOpen){
             DevelopUtil.setScreenLogOpen(false);
-            Glide.with(DevelopActivity.this)
-                    .load(R.mipmap.swich_close)
-                    .into(tv_screenLogSwitch_isOpen);
+            tv_screenLogSwitch_isOpen.setImageResource(R.mipmap.swich_close);
         }else {
             DevelopUtil.setScreenLogOpen(true);
-            Glide.with(DevelopActivity.this)
-                    .load(R.mipmap.swich_open)
-                    .into(tv_screenLogSwitch_isOpen);
+            tv_screenLogSwitch_isOpen.setImageResource(R.mipmap.swich_open);
         }
 
     }

+ 2 - 11
app/src/main/java/com/hanghui/senic/activity/MainActivity.java

@@ -108,7 +108,6 @@ public class MainActivity extends BaseActivity {
                     appStatusTextView.setText(msg);
                     break;
                 case Constants.Code_HttpResponseCallback_NetworkNormalIcon://设置网络正常图标
-                    iv_internetStatus.setImageResource(R.mipmap.network_available);
                     updateNetworkStateView();
                     break;
                 case Constants.Code_HttpResponseCallback_BottomTextType://判断底部文字文字显示(如果硬件没有开启,则直接初始化smile)
@@ -170,7 +169,6 @@ public class MainActivity extends BaseActivity {
         @Override
         public void updateView(int code, String msg) {
             if(code == 0){
-                iv_internetStatus.setImageResource(R.mipmap.network_available);
                 updateNetworkStateView();
             } else {
                 iv_internetStatus.setImageResource(R.mipmap.no_network);
@@ -194,15 +192,10 @@ public class MainActivity extends BaseActivity {
         public void updateView(int code, String msg) {
             switch (code) {
                 case Constants.Code_NetNetworkCallback_NetworkNormal:
-                    Glide.with(CommonUtil.getCurrentActivity())
-                            .load(R.mipmap.network_available)
-                            .into(iv_internetStatus);
                     updateNetworkStateView();
                     break;
                 case Constants.Code_NetNetworkCallback_NetworkAnomaly:
-                    Glide.with(CommonUtil.getCurrentActivity())
-                            .load(R.mipmap.no_network)
-                            .into(iv_internetStatus);
+                    iv_internetStatus.setImageResource(R.mipmap.no_network);
                     LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) iv_networkType.getLayoutParams();
                     layoutParams.width = (int) getResources().getDimension(R.dimen.dp_72);
                     layoutParams.height =  (int) getResources().getDimension(R.dimen.dp_32);
@@ -409,9 +402,6 @@ public class MainActivity extends BaseActivity {
         if (networkStatus) {
             appStatusTextView.setText("网络状态正常");
             appStatusTextView.setText("获取在线配置中……");
-            Glide.with(this)
-                    .load(R.mipmap.network_available)
-                    .into(iv_internetStatus);
             updateNetworkStateView();
             HttpRequest.getInstance().requestAuthentication();
         } else {
@@ -434,6 +424,7 @@ public class MainActivity extends BaseActivity {
      * 更新网络类型和internet连接状态视图
      */
     private void updateNetworkStateView() {
+        iv_internetStatus.setImageResource(R.mipmap.network_available);
         if (NetWorkUtils.getNetworkType(MainActivity.this) != -1){
             LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) iv_networkType.getLayoutParams();
             layoutParams.width = (int) getResources().getDimension(R.dimen.dp_32);

+ 25 - 69
app/src/main/java/com/hanghui/senic/activity/setup/AcquisitionActivity.java

@@ -8,8 +8,6 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.bumptech.glide.Glide;
-import com.google.gson.Gson;
 import com.hanghui.senic.bean.AuthenticationBean;
 import com.hanghui.senic.presenter.MyPresenter;
 import com.hanghui.senic.service.usbserialdemo.utile.ConfigManager;
@@ -17,7 +15,6 @@ import com.hanghui.senic.activity.BaseActivity;
 import com.hanghui.senic.bean.ParameterConfigurationBean;
 import com.hanghui.senic.common.contract.ContractInterface;
 import com.hanghui.senic.R;
-import com.hanghui.senic.service.usbserialdemo.utile.loacat.AppLogUtils;
 
 import java.util.Map;
 
@@ -131,40 +128,24 @@ public class AcquisitionActivity extends BaseActivity implements View.OnClickLis
         acquisitionActivity_isOpenPassport_image = findViewById(R.id.acquisitionActivity_isOpenPassport_image);
         acquisitionActivity_isOpenPassport.setOnClickListener(this);
         if (isOpenPassport) {
-            Glide.with(activity)
-                    .load(R.mipmap.swich_open)
-                    .into(acquisitionActivity_isOpenPassport_image);
+            acquisitionActivity_isOpenPassport_image.setImageResource(R.mipmap.swich_open);
         } else {
-            Glide.with(activity)
-                    .load(R.mipmap.swich_close)
-                    .into(acquisitionActivity_isOpenPassport_image);
+            acquisitionActivity_isOpenPassport_image.setImageResource(R.mipmap.swich_close);
         }
         if (isUseIdcard) {
-            Glide.with(activity)
-                    .load(R.mipmap.swich_open)
-                    .into(acquisitionActivity_UseIdcard_image);
+            acquisitionActivity_UseIdcard_image.setImageResource(R.mipmap.swich_open);
         } else {
-            Glide.with(activity)
-                    .load(R.mipmap.swich_close)
-                    .into(acquisitionActivity_UseIdcard_image);
+            acquisitionActivity_UseIdcard_image.setImageResource(R.mipmap.swich_close);
         }
         if (isUsePersonCard) {
-            Glide.with(activity)
-                    .load(R.mipmap.swich_open)
-                    .into(acquisitionActivity_UsePersonCard_image);
+            acquisitionActivity_UsePersonCard_image.setImageResource(R.mipmap.swich_open);
         } else {
-            Glide.with(activity)
-                    .load(R.mipmap.swich_close)
-                    .into(acquisitionActivity_UsePersonCard_image);
+            acquisitionActivity_UsePersonCard_image.setImageResource(R.mipmap.swich_close);
         }
         if (isUseQrcode) {
-            Glide.with(activity)
-                    .load(R.mipmap.swich_open)
-                    .into(acquisitionActivity_UseQrcode_image);
+            acquisitionActivity_UseQrcode_image.setImageResource(R.mipmap.swich_open);
         } else {
-            Glide.with(activity)
-                    .load(R.mipmap.swich_close)
-                    .into(acquisitionActivity_UseQrcode_image);
+            acquisitionActivity_UseQrcode_image.setImageResource(R.mipmap.swich_close);
         }
     }
 
@@ -181,13 +162,9 @@ public class AcquisitionActivity extends BaseActivity implements View.OnClickLis
                     isUseIdcard = true;
                 }
                 if (isUseIdcard) {
-                    Glide.with(activity)
-                            .load(R.mipmap.swich_open)
-                            .into(acquisitionActivity_UseIdcard_image);
+                    acquisitionActivity_UseIdcard_image.setImageResource(R.mipmap.swich_open);
                 } else {
-                    Glide.with(activity)
-                            .load(R.mipmap.swich_close)
-                            .into(acquisitionActivity_UseIdcard_image);
+                    acquisitionActivity_UseIdcard_image.setImageResource(R.mipmap.swich_close);
                 }
                 break;
             case R.id.acquisitionActivity_UsePersonCard://启用人证对比
@@ -197,13 +174,9 @@ public class AcquisitionActivity extends BaseActivity implements View.OnClickLis
                     isUsePersonCard = true;
                 }
                 if (isUsePersonCard) {
-                    Glide.with(activity)
-                            .load(R.mipmap.swich_open)
-                            .into(acquisitionActivity_UsePersonCard_image);
+                    acquisitionActivity_UsePersonCard_image.setImageResource(R.mipmap.swich_open);
                 } else {
-                    Glide.with(activity)
-                            .load(R.mipmap.swich_close)
-                            .into(acquisitionActivity_UsePersonCard_image);
+                    acquisitionActivity_UsePersonCard_image.setImageResource(R.mipmap.swich_close);
                 }
                 break;
             case R.id.acquisitionActivity_UseQrcode://启用二维码功能
@@ -213,26 +186,21 @@ public class AcquisitionActivity extends BaseActivity implements View.OnClickLis
                     isUseQrcode = true;
                 }
                 if (isUseQrcode) {
-                    Glide.with(activity)
-                            .load(R.mipmap.swich_open)
-                            .into(acquisitionActivity_UseQrcode_image);
+                    acquisitionActivity_UseQrcode_image.setImageResource(R.mipmap.swich_open);
                 } else {
-                    Glide.with(activity)
-                            .load(R.mipmap.swich_close)
-                            .into(acquisitionActivity_UseQrcode_image);
+                    acquisitionActivity_UseQrcode_image.setImageResource(R.mipmap.swich_close);
                 }
                 break;
             case R.id.acquisitionActivity_isOpenPassport:
                 if (isOpenPassport) {
                     isOpenPassport = false;
-                    Glide.with(activity)
-                            .load(R.mipmap.swich_close)
-                            .into(acquisitionActivity_isOpenPassport_image);
                 } else {
                     isOpenPassport = true;
-                    Glide.with(activity)
-                            .load(R.mipmap.swich_open)
-                            .into(acquisitionActivity_isOpenPassport_image);
+                }
+                if (isOpenPassport) {
+                    acquisitionActivity_UseQrcode_image.setImageResource(R.mipmap.swich_open);
+                } else {
+                    acquisitionActivity_UseQrcode_image.setImageResource(R.mipmap.swich_close);
                 }
                 break;
             case R.id.acquisitionActivity_SaveConfiguration://保存配置
@@ -270,33 +238,21 @@ public class AcquisitionActivity extends BaseActivity implements View.OnClickLis
 
     public void setUserData() {
         if (isUseIdcard) {
-            Glide.with(activity)
-                    .load(R.mipmap.swich_open)
-                    .into(acquisitionActivity_UseIdcard_image);
+            acquisitionActivity_UseIdcard_image.setImageResource(R.mipmap.swich_open);
         } else {
-            Glide.with(activity)
-                    .load(R.mipmap.swich_close)
-                    .into(acquisitionActivity_UseIdcard_image);
+            acquisitionActivity_UseIdcard_image.setImageResource(R.mipmap.swich_close);
         }
         ConfigManager.getAuthenticationBean().getData().get(0).setUseIdcard(isUseIdcard);
         if (isUsePersonCard) {
-            Glide.with(activity)
-                    .load(R.mipmap.swich_open)
-                    .into(acquisitionActivity_UsePersonCard_image);
+            acquisitionActivity_UsePersonCard_image.setImageResource(R.mipmap.swich_open);
         } else {
-            Glide.with(activity)
-                    .load(R.mipmap.swich_close)
-                    .into(acquisitionActivity_UsePersonCard_image);
+            acquisitionActivity_UsePersonCard_image.setImageResource(R.mipmap.swich_close);
         }
         ConfigManager.getAuthenticationBean().getData().get(0).setUsePersonCard(isUsePersonCard);
         if (isUseQrcode) {
-            Glide.with(activity)
-                    .load(R.mipmap.swich_open)
-                    .into(acquisitionActivity_UseQrcode_image);
+            acquisitionActivity_UseQrcode_image.setImageResource(R.mipmap.swich_open);
         } else {
-            Glide.with(activity)
-                    .load(R.mipmap.swich_close)
-                    .into(acquisitionActivity_UseQrcode_image);
+            acquisitionActivity_UseQrcode_image.setImageResource(R.mipmap.swich_close);
         }
         ConfigManager.getAuthenticationBean().getData().get(0).setUseQrcode(isUseQrcode);
         ConfigManager.getAuthenticationBean().getData().get(0).setOpenPassport(isOpenPassport);

+ 4 - 12
app/src/main/java/com/hanghui/senic/activity/setup/FunctionalConfigurationActivity.java

@@ -91,14 +91,10 @@ public class FunctionalConfigurationActivity extends BaseActivity implements Vie
                 ageForbidText = "未满十八周岁,禁止通行";
             }
             functionalConfigurationActivity_ageForbidText.setText(ageForbidText);
-            Glide.with(activity)
-                    .load(R.mipmap.swich_open)
-                    .into(functionalConfigurationActivity_isOpenAgeLimit_image);
+            functionalConfigurationActivity_isOpenAgeLimit_image.setImageResource(R.mipmap.swich_open);
         } else {
             functionalConfigurationActivity_LinearLayout.setVisibility(View.GONE);
-            Glide.with(activity)
-                    .load(R.mipmap.swich_close)
-                    .into(functionalConfigurationActivity_isOpenAgeLimit_image);
+            functionalConfigurationActivity_isOpenAgeLimit_image.setImageResource(R.mipmap.swich_close);
         }
         functionalConfigurationActivity_limitSectionStart.addTextChangedListener(new TextWatcher() {
             @Override
@@ -150,9 +146,7 @@ public class FunctionalConfigurationActivity extends BaseActivity implements Vie
                 if (isOpenAgeLimit) {
                     isOpenAgeLimit = false;
                     functionalConfigurationActivity_LinearLayout.setVisibility(View.GONE);
-                    Glide.with(activity)
-                            .load(R.mipmap.swich_close)
-                            .into(functionalConfigurationActivity_isOpenAgeLimit_image);
+                    functionalConfigurationActivity_isOpenAgeLimit_image.setImageResource(R.mipmap.swich_close);
                 } else {
                     isOpenAgeLimit = true;
                     functionalConfigurationActivity_LinearLayout.setVisibility(View.VISIBLE);
@@ -160,9 +154,7 @@ public class FunctionalConfigurationActivity extends BaseActivity implements Vie
                         ageForbidText = "未满十八周岁,禁止通行";
                     }
                     functionalConfigurationActivity_ageForbidText.setText(ageForbidText);
-                    Glide.with(activity)
-                            .load(R.mipmap.swich_open)
-                            .into(functionalConfigurationActivity_isOpenAgeLimit_image);
+                    functionalConfigurationActivity_isOpenAgeLimit_image.setImageResource(R.mipmap.swich_open);
                 }
                 break;
             case R.id.functionalConfigurationActivity_SaveConfiguration:

+ 4 - 12
app/src/main/java/com/hanghui/senic/activity/setup/LinkagePlatformActivity.java

@@ -74,14 +74,10 @@ public class LinkagePlatformActivity extends BaseActivity implements View.OnClic
         if (isUseLinkage) {
             linkagePlatformActivity_linkageAds.setVisibility(View.GONE);
             linkagePlatformActivity_linkageAdsEdit.setText(ConfigManager.getAuthenticationBean().getData().get(0).getLinkageAds());
-            Glide.with(activity)
-                    .load(R.mipmap.swich_open)
-                    .into(acquisitionActivity_isUseLinkage_image);
+            acquisitionActivity_isUseLinkage_image.setImageResource(R.mipmap.swich_open);
         } else {
             linkagePlatformActivity_linkageAds.setVisibility(View.GONE);
-            Glide.with(activity)
-                    .load(R.mipmap.swich_close)
-                    .into(acquisitionActivity_isUseLinkage_image);
+            acquisitionActivity_isUseLinkage_image.setImageResource(R.mipmap.swich_close);
         }
         if (linkagePlatformActivity_linkageAdsEdit.getText().length() <= 0) {//核验接口地址
             linkagePlatformActivity_linkageAdsEdit.setText(Url.URL_FEDERATEDPLATFORMS);
@@ -98,16 +94,12 @@ public class LinkagePlatformActivity extends BaseActivity implements View.OnClic
                 if (isUseLinkage) {
                     isUseLinkage = false;
                     linkagePlatformActivity_linkageAds.setVisibility(View.GONE);
-                    Glide.with(activity)
-                            .load(R.mipmap.swich_close)
-                            .into(acquisitionActivity_isUseLinkage_image);
+                    acquisitionActivity_isUseLinkage_image.setImageResource(R.mipmap.swich_close);
                 } else {
                     isUseLinkage = true;
                     linkagePlatformActivity_linkageAds.setVisibility(View.GONE);
                     linkagePlatformActivity_linkageAdsEdit.setText(ConfigManager.getAuthenticationBean().getData().get(0).getLinkageAds());
-                    Glide.with(activity)
-                            .load(R.mipmap.swich_open)
-                            .into(acquisitionActivity_isUseLinkage_image);
+                    acquisitionActivity_isUseLinkage_image.setImageResource(R.mipmap.swich_open);
                 }
                 break;
             case R.id.linkagePlatformActivity_SaveConfiguration://保存配置

+ 20 - 60
app/src/main/java/com/hanghui/senic/activity/setup/ResultConfigurationActivity.java

@@ -197,21 +197,13 @@ public class ResultConfigurationActivity extends BaseActivity implements View.On
         resultConfigurationActivity_failPageTimeSeekBar.setProgress(failPageTime);
         resultConfigurationActivity_failPageTimeText.setText(String.valueOf(failPageTime));
         if (useSerialPort.equals("default")) {
-            Glide.with(activity)
-                    .load(R.mipmap.facemode_uncheck)
-                    .into(resultConfigurationActivity_useSerialPort_RS232Image);
-            Glide.with(activity)
-                    .load(R.mipmap.facemode_check)
-                    .into(resultConfigurationActivity_useSerialPort_defaultImage);
+            resultConfigurationActivity_useSerialPort_RS232Image.setImageResource(R.mipmap.facemode_uncheck);
+            resultConfigurationActivity_useSerialPort_defaultImage.setImageResource(R.mipmap.facemode_check);
             resultConfigurationActivity_useSerialPortRS232Linear.setVisibility(View.GONE);
         } else {
             useSerialPort = "RS232";
-            Glide.with(activity)
-                    .load(R.mipmap.facemode_uncheck)
-                    .into(resultConfigurationActivity_useSerialPort_defaultImage);
-            Glide.with(activity)
-                    .load(R.mipmap.facemode_check)
-                    .into(resultConfigurationActivity_useSerialPort_RS232Image);
+            resultConfigurationActivity_useSerialPort_RS232Image.setImageResource(R.mipmap.facemode_check);
+            resultConfigurationActivity_useSerialPort_defaultImage.setImageResource(R.mipmap.facemode_uncheck);
             resultConfigurationActivity_useSerialPortRS232Linear.setVisibility(View.VISIBLE);
         }
         resultConfigurationActivity_useSerialPortDefault_sucVoice.setText(String.valueOf(sucVoice));
@@ -230,15 +222,11 @@ public class ResultConfigurationActivity extends BaseActivity implements View.On
                 rightTopBarText = "当日检票次数";
             }
             resultConfigurationActivity_rightTopBarText.setText(rightTopBarText);
-            Glide.with(activity)
-                    .load(R.mipmap.swich_open)
-                    .into(resultConfigurationActivity_showTopBar_image);
+            resultConfigurationActivity_showTopBar_image.setImageResource(R.mipmap.swich_open);
         } else {
             resultConfigurationActivity_leftTopBarTextLinear.setVisibility(View.GONE);
             resultConfigurationActivity_rightTopBarTextLinear.setVisibility(View.GONE);
-            Glide.with(activity)
-                    .load(R.mipmap.swich_close)
-                    .into(resultConfigurationActivity_showTopBar_image);
+            resultConfigurationActivity_showTopBar_image.setImageResource(R.mipmap.swich_close);
         }
         //继电器模式
         //开-闭模式
@@ -317,22 +305,14 @@ public class ResultConfigurationActivity extends BaseActivity implements View.On
         resultConfigurationActivity_OpenDoorMagnetClosingTimeOutSeekBar.setProgress(openDoorMagnetClosingTimeOut);
         resultConfigurationActivity_OpenDoorMagnetClosingTimeOutText.setText(String.valueOf(openDoorMagnetClosingTimeOut));
         if (relayOpenModel == 1) {
-            Glide.with(activity)
-                    .load(R.mipmap.facemode_check)
-                    .into(resultConfigurationActivity_OpenORClosingImage);
-            Glide.with(activity)
-                    .load(R.mipmap.facemode_uncheck)
-                    .into(resultConfigurationActivity_OpenDoorMagnetClosingImage);
+            resultConfigurationActivity_OpenORClosingImage.setImageResource(R.mipmap.facemode_check);
+            resultConfigurationActivity_OpenDoorMagnetClosingImage.setImageResource(R.mipmap.facemode_uncheck);
             resultConfigurationActivity_OpenDoorMagnetClosingTimeOut.setVisibility(View.GONE);
             resultConfigurationActivity_ResultConfigurationActivity_OpenORClosingTime.setVisibility(View.VISIBLE);
         } else {
-            Glide.with(activity)
-                    .load(R.mipmap.facemode_check)
-                    .into(resultConfigurationActivity_OpenDoorMagnetClosingImage);
-            Glide.with(activity)
-                    .load(R.mipmap.facemode_uncheck)
-                    .into(resultConfigurationActivity_OpenORClosingImage);
+            resultConfigurationActivity_OpenDoorMagnetClosingImage.setImageResource(R.mipmap.facemode_check);
             resultConfigurationActivity_OpenDoorMagnetClosingTimeOut.setVisibility(View.VISIBLE);
+            resultConfigurationActivity_OpenORClosingImage.setImageResource(R.mipmap.facemode_uncheck);
             resultConfigurationActivity_ResultConfigurationActivity_OpenORClosingTime.setVisibility(View.GONE);
         }
     }
@@ -345,22 +325,14 @@ public class ResultConfigurationActivity extends BaseActivity implements View.On
                 break;
             case R.id.resultConfigurationActivity_useSerialPort_default://选择继电器
                 useSerialPort = "default";
-                Glide.with(activity)
-                        .load(R.mipmap.facemode_uncheck)
-                        .into(resultConfigurationActivity_useSerialPort_RS232Image);
-                Glide.with(activity)
-                        .load(R.mipmap.facemode_check)
-                        .into(resultConfigurationActivity_useSerialPort_defaultImage);
+                resultConfigurationActivity_useSerialPort_RS232Image.setImageResource(R.mipmap.facemode_uncheck);
+                resultConfigurationActivity_useSerialPort_defaultImage.setImageResource(R.mipmap.facemode_check);
                 resultConfigurationActivity_useSerialPortRS232Linear.setVisibility(View.GONE);
                 break;
             case R.id.resultConfigurationActivity_useSerialPort_RS232://选择RS232
                 useSerialPort = "RS232";
-                Glide.with(activity)
-                        .load(R.mipmap.facemode_uncheck)
-                        .into(resultConfigurationActivity_useSerialPort_defaultImage);
-                Glide.with(activity)
-                        .load(R.mipmap.facemode_check)
-                        .into(resultConfigurationActivity_useSerialPort_RS232Image);
+                resultConfigurationActivity_useSerialPort_defaultImage.setImageResource(R.mipmap.facemode_uncheck);
+                resultConfigurationActivity_useSerialPort_RS232Image.setImageResource(R.mipmap.facemode_check);
                 resultConfigurationActivity_useSerialPortRS232Linear.setVisibility(View.VISIBLE);
                 break;
             case R.id.resultConfigurationActivity_showTopBar://顶部标题栏
@@ -376,16 +348,12 @@ public class ResultConfigurationActivity extends BaseActivity implements View.On
                         rightTopBarText = "当日检票次数";
                     }
                     resultConfigurationActivity_rightTopBarText.setText(rightTopBarText);
-                    Glide.with(activity)
-                            .load(R.mipmap.swich_open)
-                            .into(resultConfigurationActivity_showTopBar_image);
+                    resultConfigurationActivity_showTopBar_image.setImageResource(R.mipmap.swich_open);
                 } else {
                     showTopBar = false;
                     resultConfigurationActivity_leftTopBarTextLinear.setVisibility(View.GONE);
                     resultConfigurationActivity_rightTopBarTextLinear.setVisibility(View.GONE);
-                    Glide.with(activity)
-                            .load(R.mipmap.swich_close)
-                            .into(resultConfigurationActivity_showTopBar_image);
+                    resultConfigurationActivity_showTopBar_image.setImageResource(R.mipmap.swich_close);
                 }
                 break;
             case R.id.resultConfigurationActivity_OpenORClosing://开-闭模式
@@ -394,12 +362,8 @@ public class ResultConfigurationActivity extends BaseActivity implements View.On
                 resultConfigurationActivity_ResultConfigurationActivity_OpenORClosingTimeIntervalText.setText(String.valueOf(openORClosingTimeInterval));
                 resultConfigurationActivity_ResultConfigurationActivity_OpenORClosingTimeSignalSeekBar.setProgress(openORClosingTimeSignal);
                 resultConfigurationActivity_ResultConfigurationActivity_OpenORClosingTimeSignalText.setText(String.valueOf(openORClosingTimeSignal));
-                Glide.with(activity)
-                        .load(R.mipmap.facemode_check)
-                        .into(resultConfigurationActivity_OpenORClosingImage);
-                Glide.with(activity)
-                        .load(R.mipmap.facemode_uncheck)
-                        .into(resultConfigurationActivity_OpenDoorMagnetClosingImage);
+                resultConfigurationActivity_OpenORClosingImage.setImageResource(R.mipmap.facemode_check);
+                resultConfigurationActivity_OpenDoorMagnetClosingImage.setImageResource(R.mipmap.facemode_uncheck);
                 resultConfigurationActivity_OpenDoorMagnetClosingTimeOut.setVisibility(View.GONE);
                 resultConfigurationActivity_ResultConfigurationActivity_OpenORClosingTime.setVisibility(View.VISIBLE);
                 break;
@@ -407,12 +371,8 @@ public class ResultConfigurationActivity extends BaseActivity implements View.On
                 relayOpenModel = 2;
                 resultConfigurationActivity_OpenDoorMagnetClosingTimeOutSeekBar.setProgress(openDoorMagnetClosingTimeOut);
                 resultConfigurationActivity_OpenDoorMagnetClosingTimeOutText.setText(openDoorMagnetClosingTimeOut);
-                Glide.with(activity)
-                        .load(R.mipmap.facemode_check)
-                        .into(resultConfigurationActivity_OpenDoorMagnetClosingImage);
-                Glide.with(activity)
-                        .load(R.mipmap.facemode_uncheck)
-                        .into(resultConfigurationActivity_OpenORClosingImage);
+                resultConfigurationActivity_OpenDoorMagnetClosingImage.setImageResource(R.mipmap.facemode_check);
+                resultConfigurationActivity_OpenORClosingImage.setImageResource(R.mipmap.facemode_uncheck);
                 resultConfigurationActivity_OpenDoorMagnetClosingTimeOut.setVisibility(View.VISIBLE);
                 resultConfigurationActivity_ResultConfigurationActivity_OpenORClosingTime.setVisibility(View.GONE);
                 break;

+ 31 - 77
app/src/main/java/com/hanghui/senic/activity/setup/SystemConfigurationActivity.java

@@ -148,23 +148,14 @@ public class SystemConfigurationActivity extends BaseActivity implements View.On
         VolumeUtil.getInstance().setMediaVolume(MediaVolume);
         systemConfigurationActivity_volumeSeekBar.setProgress(volume);
         if (isHideNavigationBar) {
-            Glide.with(activity)
-                    .load(R.mipmap.swich_open)
-                    .into(systemConfigurationActivity_hideNavigationBar_image);
+            systemConfigurationActivity_hideNavigationBar_image.setImageResource(R.mipmap.swich_open);
         } else {
-            Glide.with(activity)
-                    .load(R.mipmap.swich_close)
-                    .into(systemConfigurationActivity_hideNavigationBar_image);
+            systemConfigurationActivity_hideNavigationBar_image.setImageResource(R.mipmap.swich_close);
         }
         if (isForbidPullDown) {
-            Glide.with(activity)
-                    .load(R.mipmap.swich_open)
-                    .into(systemConfigurationActivity_forbidPullDown_image);
-
+            systemConfigurationActivity_forbidPullDown_image.setImageResource(R.mipmap.swich_open);
         } else {
-            Glide.with(activity)
-                    .load(R.mipmap.swich_close)
-                    .into(systemConfigurationActivity_forbidPullDown_image);
+            systemConfigurationActivity_forbidPullDown_image.setImageResource(R.mipmap.swich_close);
         }
         if (!StringIsNull.IsStringNull(mpassword)) {
             systemConfigurationActivity_mpassword.setText(mpassword);
@@ -174,14 +165,9 @@ public class SystemConfigurationActivity extends BaseActivity implements View.On
         functionalConfigurationActivity_autoLaunch_image = findViewById(R.id.functionalConfigurationActivity_autoLaunch_image);
         functionalConfigurationActivity_autoLaunch.setOnClickListener(this);
         if (autoLaunch) {
-            Glide.with(activity)
-                    .load(R.mipmap.swich_open)
-                    .into(functionalConfigurationActivity_autoLaunch_image);
-
+            functionalConfigurationActivity_autoLaunch_image.setImageResource(R.mipmap.swich_open);
         } else {
-            Glide.with(activity)
-                    .load(R.mipmap.swich_close)
-                    .into(functionalConfigurationActivity_autoLaunch_image);
+            functionalConfigurationActivity_autoLaunch_image.setImageResource(R.mipmap.swich_close);
         }
         //补光灯
         systemConfigurationActivity_lightMode_auto = findViewById(R.id.systemConfigurationActivity_lightMode_auto);
@@ -200,14 +186,10 @@ public class SystemConfigurationActivity extends BaseActivity implements View.On
         functionalConfigurationActivity_OpenTimingReboot = findViewById(R.id.functionalConfigurationActivity_OpenTimingReboot);
         functionalConfigurationActivity_OpenTimingReboot_TextView = findViewById(R.id.functionalConfigurationActivity_OpenTimingReboot_TextView);
         if (scheduledRestart) {
-            Glide.with(activity)
-                    .load(R.mipmap.swich_open)
-                    .into(functionalConfigurationActivity_timingReboot_image);
+            functionalConfigurationActivity_timingReboot_image.setImageResource(R.mipmap.swich_open);
             functionalConfigurationActivity_OpenTimingReboot.setVisibility(View.VISIBLE);
         } else {
-            Glide.with(activity)
-                    .load(R.mipmap.swich_close)
-                    .into(functionalConfigurationActivity_timingReboot_image);
+            functionalConfigurationActivity_timingReboot_image.setImageResource(R.mipmap.swich_close);
             functionalConfigurationActivity_OpenTimingReboot.setVisibility(View.GONE);
         }
         functionalConfigurationActivity_OpenTimingReboot_TextView.setText(scheduledRestartTime);
@@ -224,14 +206,10 @@ public class SystemConfigurationActivity extends BaseActivity implements View.On
             case R.id.systemConfigurationActivity_hideNavigationBar://隐藏底部导航栏
                 if (isHideNavigationBar) {
                     isHideNavigationBar = false;
-                    Glide.with(activity)
-                            .load(R.mipmap.swich_close)
-                            .into(systemConfigurationActivity_hideNavigationBar_image);
+                    systemConfigurationActivity_hideNavigationBar_image.setImageResource(R.mipmap.swich_close);
                 } else {
                     isHideNavigationBar = true;
-                    Glide.with(activity)
-                            .load(R.mipmap.swich_open)
-                            .into(systemConfigurationActivity_hideNavigationBar_image);
+                    systemConfigurationActivity_hideNavigationBar_image.setImageResource(R.mipmap.swich_open);
                 }
                 // 隐藏底部导航栏 false-不启用(默认) true-启用
                 if (!isHideNavigationBar) {
@@ -243,14 +221,10 @@ public class SystemConfigurationActivity extends BaseActivity implements View.On
             case R.id.systemConfigurationActivity_forbidPullDown://禁止下拉通知栏
                 if (isForbidPullDown) {
                     isForbidPullDown = false;
-                    Glide.with(activity)
-                            .load(R.mipmap.swich_close)
-                            .into(systemConfigurationActivity_forbidPullDown_image);
+                    systemConfigurationActivity_forbidPullDown_image.setImageResource(R.mipmap.swich_close);
                 } else {
                     isForbidPullDown = true;
-                    Glide.with(activity)
-                            .load(R.mipmap.swich_open)
-                            .into(systemConfigurationActivity_forbidPullDown_image);
+                    systemConfigurationActivity_forbidPullDown_image.setImageResource(R.mipmap.swich_open);
                 }
                 // 下拉通知栏
                 if (!isForbidPullDown) {
@@ -274,28 +248,20 @@ public class SystemConfigurationActivity extends BaseActivity implements View.On
             case R.id.functionalConfigurationActivity_autoLaunch:
                 if (autoLaunch) {
                     autoLaunch = false;
-                    Glide.with(activity)
-                            .load(R.mipmap.swich_close)
-                            .into(functionalConfigurationActivity_autoLaunch_image);
+                    functionalConfigurationActivity_autoLaunch_image.setImageResource(R.mipmap.swich_close);
                 } else {
                     autoLaunch = true;
-                    Glide.with(activity)
-                            .load(R.mipmap.swich_open)
-                            .into(functionalConfigurationActivity_autoLaunch_image);
+                    functionalConfigurationActivity_autoLaunch_image.setImageResource(R.mipmap.swich_open);
                 }
                 break;
             case R.id.functionalConfigurationActivity_timingReboot://是否开启定时重启
                 if (scheduledRestart) {
                     scheduledRestart = false;
-                    Glide.with(activity)
-                            .load(R.mipmap.swich_close)
-                            .into(functionalConfigurationActivity_timingReboot_image);
+                    functionalConfigurationActivity_timingReboot_image.setImageResource(R.mipmap.swich_close);
                     functionalConfigurationActivity_OpenTimingReboot.setVisibility(View.GONE);
                 } else {
                     scheduledRestart = true;
-                    Glide.with(activity)
-                            .load(R.mipmap.swich_open)
-                            .into(functionalConfigurationActivity_timingReboot_image);
+                    functionalConfigurationActivity_timingReboot_image.setImageResource(R.mipmap.swich_open);
                     functionalConfigurationActivity_OpenTimingReboot.setVisibility(View.VISIBLE);
                 }
                 functionalConfigurationActivity_OpenTimingReboot_TextView.setText(scheduledRestartTime);
@@ -374,37 +340,25 @@ public class SystemConfigurationActivity extends BaseActivity implements View.On
     private void setLightMode(String type) {
         switch (type) {
             case "auto":
-                Glide.with(activity)
-                        .load(R.mipmap.facemode_check)
-                        .into(systemConfigurationActivity_lightMode_autoImageView);
-                Glide.with(activity)
-                        .load(R.mipmap.facemode_uncheck)
-                        .into(systemConfigurationActivity_lightMode_SolidOn_Image);
-                Glide.with(activity)
-                        .load(R.mipmap.facemode_uncheck)
-                        .into(systemConfigurationActivity_lightMode_close_Image);
+                systemConfigurationActivity_lightMode_autoImageView.setImageResource(R.mipmap.facemode_check);
+
+                systemConfigurationActivity_lightMode_SolidOn_Image.setImageResource(R.mipmap.facemode_uncheck);
+
+                systemConfigurationActivity_lightMode_close_Image.setImageResource(R.mipmap.facemode_uncheck);
                 break;
             case "open":
-                Glide.with(activity)
-                        .load(R.mipmap.facemode_uncheck)
-                        .into(systemConfigurationActivity_lightMode_autoImageView);
-                Glide.with(activity)
-                        .load(R.mipmap.facemode_check)
-                        .into(systemConfigurationActivity_lightMode_SolidOn_Image);
-                Glide.with(activity)
-                        .load(R.mipmap.facemode_uncheck)
-                        .into(systemConfigurationActivity_lightMode_close_Image);
+                systemConfigurationActivity_lightMode_autoImageView.setImageResource(R.mipmap.facemode_uncheck);
+
+                systemConfigurationActivity_lightMode_SolidOn_Image.setImageResource(R.mipmap.facemode_check);
+
+                systemConfigurationActivity_lightMode_close_Image.setImageResource(R.mipmap.facemode_uncheck);
                 break;
             case "close":
-                Glide.with(activity)
-                        .load(R.mipmap.facemode_uncheck)
-                        .into(systemConfigurationActivity_lightMode_autoImageView);
-                Glide.with(activity)
-                        .load(R.mipmap.facemode_uncheck)
-                        .into(systemConfigurationActivity_lightMode_SolidOn_Image);
-                Glide.with(activity)
-                        .load(R.mipmap.facemode_check)
-                        .into(systemConfigurationActivity_lightMode_close_Image);
+                systemConfigurationActivity_lightMode_autoImageView.setImageResource(R.mipmap.facemode_uncheck);
+
+                systemConfigurationActivity_lightMode_SolidOn_Image.setImageResource(R.mipmap.facemode_uncheck);
+
+                systemConfigurationActivity_lightMode_close_Image.setImageResource(R.mipmap.facemode_check);
                 break;
         }
     }

+ 8 - 24
app/src/main/java/com/hanghui/senic/activity/setup/ZFBBrushFaceActivity.java

@@ -137,20 +137,12 @@ public class ZFBBrushFaceActivity extends BaseActivity implements View.OnClickLi
         zfbBrushFaceActivity_SaveConfigurationLodding = findViewById(R.id.zfbBrushFaceActivity_SaveConfigurationLodding);
         if (faceMode.equals("click")) {
             zfbBrushFaceActivity_faceModeClick_Linear.setVisibility(View.VISIBLE);
-            Glide.with(activity)
-                    .load(R.mipmap.facemode_uncheck)
-                    .into(zfbBrushFaceActivity_faceMode_autoImage);
-            Glide.with(activity)
-                    .load(R.mipmap.facemode_check)
-                    .into(zfbBrushFaceActivity_faceMode_clickImage);
+            zfbBrushFaceActivity_faceMode_autoImage.setImageResource(R.mipmap.facemode_uncheck);
+            zfbBrushFaceActivity_faceMode_clickImage.setImageResource(R.mipmap.facemode_check);
         } else {
             zfbBrushFaceActivity_faceModeClick_Linear.setVisibility(View.GONE);
-            Glide.with(activity)
-                    .load(R.mipmap.facemode_check)
-                    .into(zfbBrushFaceActivity_faceMode_autoImage);
-            Glide.with(activity)
-                    .load(R.mipmap.facemode_uncheck)
-                    .into(zfbBrushFaceActivity_faceMode_clickImage);
+            zfbBrushFaceActivity_faceMode_autoImage.setImageResource(R.mipmap.facemode_check);
+            zfbBrushFaceActivity_faceMode_clickImage.setImageResource(R.mipmap.facemode_uncheck);
         }
 
         if (UseEntryDetector.equals("normal")) {
@@ -171,22 +163,14 @@ public class ZFBBrushFaceActivity extends BaseActivity implements View.OnClickLi
                 break;
             case R.id.zfbBrushFaceActivity_faceMode_autoRelativeLayout://点击了自动按钮
                 faceMode = "auto";
-                Glide.with(activity)
-                        .load(R.mipmap.facemode_check)
-                        .into(zfbBrushFaceActivity_faceMode_autoImage);
-                Glide.with(activity)
-                        .load(R.mipmap.facemode_uncheck)
-                        .into(zfbBrushFaceActivity_faceMode_clickImage);
+                zfbBrushFaceActivity_faceMode_autoImage.setImageResource(R.mipmap.facemode_check);
+                zfbBrushFaceActivity_faceMode_clickImage.setImageResource(R.mipmap.facemode_uncheck);
                 zfbBrushFaceActivity_faceModeClick_Linear.setVisibility(View.GONE);
                 break;
             case R.id.zfbBrushFaceActivity_faceMode_clickRelativeLayout://点击了 点击按钮
                 faceMode = "click";
-                Glide.with(activity)
-                        .load(R.mipmap.facemode_uncheck)
-                        .into(zfbBrushFaceActivity_faceMode_autoImage);
-                Glide.with(activity)
-                        .load(R.mipmap.facemode_check)
-                        .into(zfbBrushFaceActivity_faceMode_clickImage);
+                zfbBrushFaceActivity_faceMode_autoImage.setImageResource(R.mipmap.facemode_uncheck);
+                zfbBrushFaceActivity_faceMode_clickImage.setImageResource(R.mipmap.facemode_check);
                 zfbBrushFaceActivity_faceModeClick_Linear.setVisibility(View.VISIBLE);
 
                 break;

+ 8 - 24
app/src/main/java/com/hanghui/senic/activity/setup/zoloConfigCameraActivity.java

@@ -156,24 +156,16 @@ public class zoloConfigCameraActivity extends BaseActivity implements View.OnCli
         zoloConfigCameraActivity_displayAngleSeekBar.setProgress(displayAngle);
 
         if (isMirror) {
-            Glide.with(activity)
-                    .load(R.mipmap.swich_open)
-                    .into(zoloConfigCameraActivity_isMirror_image);
+            zoloConfigCameraActivity_isMirror_image.setImageResource(R.mipmap.swich_open);
 
         } else {
-            Glide.with(activity)
-                    .load(R.mipmap.swich_close)
-                    .into(zoloConfigCameraActivity_isMirror_image);
+            zoloConfigCameraActivity_isMirror_image.setImageResource(R.mipmap.swich_close);
         }
 
         if (isDisplayMirror) {
-            Glide.with(activity)
-                    .load(R.mipmap.swich_open)
-                    .into(zoloConfigCameraActivity_isDisplayMirror_image);
+            zoloConfigCameraActivity_isDisplayMirror_image.setImageResource(R.mipmap.swich_open);
         } else {
-            Glide.with(activity)
-                    .load(R.mipmap.swich_close)
-                    .into(zoloConfigCameraActivity_isDisplayMirror_image);
+            zoloConfigCameraActivity_isDisplayMirror_image.setImageResource(R.mipmap.swich_close);
         }
     }
 
@@ -186,27 +178,19 @@ public class zoloConfigCameraActivity extends BaseActivity implements View.OnCli
             case R.id.zoloConfigCameraActivity_isMirror://RGB摄像头镜像
                 if (isMirror) {
                     isMirror = false;
-                    Glide.with(activity)
-                            .load(R.mipmap.swich_close)
-                            .into(zoloConfigCameraActivity_isMirror_image);
+                    zoloConfigCameraActivity_isMirror_image.setImageResource(R.mipmap.swich_close);
                 } else {
                     isMirror = true;
-                    Glide.with(activity)
-                            .load(R.mipmap.swich_open)
-                            .into(zoloConfigCameraActivity_isMirror_image);
+                    zoloConfigCameraActivity_isMirror_image.setImageResource(R.mipmap.swich_open);
                 }
                 break;
             case R.id.zoloConfigCameraActivity_isDisplayMirror://IR摄像头镜像
                 if (isDisplayMirror) {
                     isDisplayMirror = false;
-                    Glide.with(activity)
-                            .load(R.mipmap.swich_close)
-                            .into(zoloConfigCameraActivity_isDisplayMirror_image);
+                    zoloConfigCameraActivity_isDisplayMirror_image.setImageResource(R.mipmap.swich_close);
                 } else {
                     isDisplayMirror = true;
-                    Glide.with(activity)
-                            .load(R.mipmap.swich_open)
-                            .into(zoloConfigCameraActivity_isDisplayMirror_image);
+                    zoloConfigCameraActivity_isDisplayMirror_image.setImageResource(R.mipmap.swich_open);
                 }
                 break;
             case R.id.zoloConfigCameraActivity_SaveConfiguration://保存配置