diff --git a/app/src/main/java/com/rehome/dywoa/adapter/GridImageAdapter.java b/app/src/main/java/com/rehome/dywoa/adapter/GridImageAdapter.java
index e9505a3..ba4243a 100644
--- a/app/src/main/java/com/rehome/dywoa/adapter/GridImageAdapter.java
+++ b/app/src/main/java/com/rehome/dywoa/adapter/GridImageAdapter.java
@@ -26,6 +26,7 @@ import com.luck.picture.lib.utils.DateUtils;
 import com.rehome.dywoa.Listener.OnItemLongClickListener;
 import com.rehome.dywoa.R;
 
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -164,15 +165,15 @@ public class GridImageAdapter extends RecyclerView.Adapter<GridImageAdapter.View
             if (chooseModel == SelectMimeType.ofAudio()) {
                 viewHolder.tvDuration.setVisibility(View.VISIBLE);
                 viewHolder.tvDuration.setCompoundDrawablesRelativeWithIntrinsicBounds
-                        (R.drawable.ps_ic_audio, 0, 0, 0);
+                        (com.luck.picture.lib.R.drawable.ps_ic_audio, 0, 0, 0);
 
             } else {
                 viewHolder.tvDuration.setCompoundDrawablesRelativeWithIntrinsicBounds
-                        (R.drawable.ps_ic_video, 0, 0, 0);
+                        (com.luck.picture.lib.R.drawable.ps_ic_video, 0, 0, 0);
             }
             viewHolder.tvDuration.setText(DateUtils.formatDurationTime(duration));
             if (chooseModel == SelectMimeType.ofAudio()) {
-                viewHolder.mImg.setImageResource(R.drawable.ps_audio_placeholder);
+                viewHolder.mImg.setImageResource(com.luck.picture.lib.R.drawable.ps_audio_placeholder);
             } else {
                 Glide.with(viewHolder.itemView.getContext())
                         .load(PictureMimeType.isContent(path) && !media.isCut() && !media.isCompressed() ? Uri.parse(path)
diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt
index 5cfc02f..23b812d 100644
--- a/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt
+++ b/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt
@@ -188,12 +188,12 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 
         if (isApkInDebug(context)) {
             //测试
-            binding.etUsername.setText("371522")
-            binding.etPassword.setText("A000000a")
+//            binding.etUsername.setText("371522")
+//            binding.etPassword.setText("A000000a")
 
             //ceshi1
-//            binding.etUsername.setText("ceshi1")
-//            binding.etPassword.setText("A000000a")
+            binding.etUsername.setText("ceshi1")
+            binding.etPassword.setText("A000000a")
 
 //            binding.etUsername.setText("CY00011")
 //            binding.etPassword.setText("A000000a")
diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/AjhFragment.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/AjhFragment.java
index 5c4e8dd..a415b7f 100644
--- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/AjhFragment.java
+++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/AjhFragment.java
@@ -98,18 +98,28 @@ public class AjhFragment extends BaseFragment {
             @Override
             public void onCheckedChanged(RadioGroup group, int checkedId) {
 
-                switch (checkedId) {
-                    case R.id.rb1:
-                        rb1.setTextColor(getResources().getColor(R.color.btn));
-                        rb2.setTextColor(Color.GRAY);
-                        vp.setCurrentItem(0, false);
-                        break;
-                    case R.id.rb2:
-                        rb2.setTextColor(getResources().getColor(R.color.btn));
-                        rb1.setTextColor(Color.GRAY);
-                        vp.setCurrentItem(1, false);
-                        break;
+                if(checkedId==R.id.rb1){
+                    rb1.setTextColor(getResources().getColor(R.color.btn));
+                    rb2.setTextColor(Color.GRAY);
+                    vp.setCurrentItem(0, false);
+                }
+                if(checkedId==R.id.rb2){
+                    rb2.setTextColor(getResources().getColor(R.color.btn));
+                    rb1.setTextColor(Color.GRAY);
+                    vp.setCurrentItem(1, false);
                 }
+//                switch (checkedId) {
+//                    case R.id.rb1:
+//                        rb1.setTextColor(getResources().getColor(R.color.btn));
+//                        rb2.setTextColor(Color.GRAY);
+//                        vp.setCurrentItem(0, false);
+//                        break;
+//                    case R.id.rb2:
+//                        rb2.setTextColor(getResources().getColor(R.color.btn));
+//                        rb1.setTextColor(Color.GRAY);
+//                        vp.setCurrentItem(1, false);
+//                        break;
+//                }
             }
         });
     }
diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SbdjFragment.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SbdjFragment.java
index 379e399..a00322a 100644
--- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SbdjFragment.java
+++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SbdjFragment.java
@@ -102,26 +102,44 @@ public class SbdjFragment extends BaseFragment {
         rg.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
                                           @Override
                                           public void onCheckedChanged(RadioGroup radioGroup, int i) {
-                                              switch (i) {
-                                                  case R.id.rb1:
-                                                      rb1.setTextColor(Color.WHITE);
-                                                      rb2.setTextColor(Color.GRAY);
-                                                      rb3.setTextColor(Color.GRAY);
-                                                      vp.setCurrentItem(0, false);
-                                                      break;
-                                                  case R.id.rb2:
-                                                      rb1.setTextColor(Color.GRAY);
-                                                      rb2.setTextColor(Color.WHITE);
-                                                      rb3.setTextColor(Color.GRAY);
-                                                      vp.setCurrentItem(1, false);
-                                                      break;
-                                                  case R.id.rb3:
-                                                      rb1.setTextColor(Color.GRAY);
-                                                      rb2.setTextColor(Color.GRAY);
-                                                      rb3.setTextColor(Color.WHITE);
-                                                      vp.setCurrentItem(2, false);
-                                                      break;
+                                              if(i==R.id.rb1){
+                                                  rb1.setTextColor(Color.WHITE);
+                                                  rb2.setTextColor(Color.GRAY);
+                                                  rb3.setTextColor(Color.GRAY);
+                                                  vp.setCurrentItem(0, false);
                                               }
+                                              if(i==R.id.rb2){
+                                                  rb1.setTextColor(Color.GRAY);
+                                                  rb2.setTextColor(Color.WHITE);
+                                                  rb3.setTextColor(Color.GRAY);
+                                                  vp.setCurrentItem(1, false);
+                                              }
+                                              if(i==R.id.rb3){
+                                                  rb1.setTextColor(Color.GRAY);
+                                                  rb2.setTextColor(Color.GRAY);
+                                                  rb3.setTextColor(Color.WHITE);
+                                                  vp.setCurrentItem(2, false);
+                                              }
+//                                              switch (i) {
+//                                                  case R.id.rb1:
+//                                                      rb1.setTextColor(Color.WHITE);
+//                                                      rb2.setTextColor(Color.GRAY);
+//                                                      rb3.setTextColor(Color.GRAY);
+//                                                      vp.setCurrentItem(0, false);
+//                                                      break;
+//                                                  case R.id.rb2:
+//                                                      rb1.setTextColor(Color.GRAY);
+//                                                      rb2.setTextColor(Color.WHITE);
+//                                                      rb3.setTextColor(Color.GRAY);
+//                                                      vp.setCurrentItem(1, false);
+//                                                      break;
+//                                                  case R.id.rb3:
+//                                                      rb1.setTextColor(Color.GRAY);
+//                                                      rb2.setTextColor(Color.GRAY);
+//                                                      rb3.setTextColor(Color.WHITE);
+//                                                      vp.setCurrentItem(2, false);
+//                                                      break;
+//                                              }
                                           }
                                       }
         );
diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/RecordEventActivity.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/RecordEventActivity.java
index 612ac5b..6b70f4b 100644
--- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/RecordEventActivity.java
+++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/RecordEventActivity.java
@@ -589,19 +589,19 @@ public class RecordEventActivity extends BaseActivityViewBinding<ActivityRecordE
                 options.setStatusBarColor(statusBarColor);
                 options.setToolbarColor(statusBarColor);
             } else {
-                options.setStatusBarColor(ContextCompat.getColor(getContext(), R.color.ps_color_grey));
-                options.setToolbarColor(ContextCompat.getColor(getContext(), R.color.ps_color_grey));
+                options.setStatusBarColor(ContextCompat.getColor(getContext(), com.luck.picture.lib.R.color.ps_color_grey));
+                options.setToolbarColor(ContextCompat.getColor(getContext(), com.luck.picture.lib.R.color.ps_color_grey));
             }
             TitleBarStyle titleBarStyle = selectorStyle.getTitleBarStyle();
             if (StyleUtils.checkStyleValidity(titleBarStyle.getTitleTextColor())) {
                 options.setToolbarWidgetColor(titleBarStyle.getTitleTextColor());
             } else {
-                options.setToolbarWidgetColor(ContextCompat.getColor(getContext(), R.color.ps_color_white));
+                options.setToolbarWidgetColor(ContextCompat.getColor(getContext(), com.luck.picture.lib.R.color.ps_color_white));
             }
         } else {
-            options.setStatusBarColor(ContextCompat.getColor(getContext(), R.color.ps_color_grey));
-            options.setToolbarColor(ContextCompat.getColor(getContext(), R.color.ps_color_grey));
-            options.setToolbarWidgetColor(ContextCompat.getColor(getContext(), R.color.ps_color_white));
+            options.setStatusBarColor(ContextCompat.getColor(getContext(), com.luck.picture.lib.R.color.ps_color_grey));
+            options.setToolbarColor(ContextCompat.getColor(getContext(), com.luck.picture.lib.R.color.ps_color_grey));
+            options.setToolbarWidgetColor(ContextCompat.getColor(getContext(), com.luck.picture.lib.R.color.ps_color_white));
         }
         return options;
     }
diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/SbxjcjsbActivity.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/SbxjcjsbActivity.java
index 9d519c6..1311cb2 100644
--- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/SbxjcjsbActivity.java
+++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/SbxjcjsbActivity.java
@@ -283,26 +283,45 @@ public class SbxjcjsbActivity extends BaseActivity {
             @Override
             public void onCheckedChanged(RadioGroup radioGroup, int i) {
 
-                switch (i) {
-                    case R.id.rb1:
-                        rb1.setTextColor(Color.WHITE);
-                        rb2.setTextColor(Color.GRAY);
-                        rb3.setTextColor(Color.GRAY);
-                        vp.setCurrentItem(0, false);
-                        break;
-                    case R.id.rb2:
-                        rb1.setTextColor(Color.GRAY);
-                        rb2.setTextColor(Color.WHITE);
-                        rb3.setTextColor(Color.GRAY);
-                        vp.setCurrentItem(1, false);
-                        break;
-                    case R.id.rb3:
-                        rb1.setTextColor(Color.GRAY);
-                        rb2.setTextColor(Color.GRAY);
-                        rb3.setTextColor(Color.WHITE);
-                        vp.setCurrentItem(2, false);
-                        break;
+                if(i==R.id.rb1){
+                    rb1.setTextColor(Color.WHITE);
+                    rb2.setTextColor(Color.GRAY);
+                    rb3.setTextColor(Color.GRAY);
+                    vp.setCurrentItem(0, false);
                 }
+                if(i==R.id.rb2){
+                    rb1.setTextColor(Color.GRAY);
+                    rb2.setTextColor(Color.WHITE);
+                    rb3.setTextColor(Color.GRAY);
+                    vp.setCurrentItem(1, false);
+                }
+                if(i==R.id.rb3){
+                    rb1.setTextColor(Color.GRAY);
+                    rb2.setTextColor(Color.GRAY);
+                    rb3.setTextColor(Color.WHITE);
+                    vp.setCurrentItem(2, false);
+                }
+
+//                switch (i) {
+//                    case R.id.rb1:
+//                        rb1.setTextColor(Color.WHITE);
+//                        rb2.setTextColor(Color.GRAY);
+//                        rb3.setTextColor(Color.GRAY);
+//                        vp.setCurrentItem(0, false);
+//                        break;
+//                    case R.id.rb2:
+//                        rb1.setTextColor(Color.GRAY);
+//                        rb2.setTextColor(Color.WHITE);
+//                        rb3.setTextColor(Color.GRAY);
+//                        vp.setCurrentItem(1, false);
+//                        break;
+//                    case R.id.rb3:
+//                        rb1.setTextColor(Color.GRAY);
+//                        rb2.setTextColor(Color.GRAY);
+//                        rb3.setTextColor(Color.WHITE);
+//                        vp.setCurrentItem(2, false);
+//                        break;
+//                }
             }
         });
     }
diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/vpn/AuthSuccessActivity.java b/app/src/main/java/com/rehome/dywoa/ui/activity/vpn/AuthSuccessActivity.java
index b33e59e..6353f1e 100644
--- a/app/src/main/java/com/rehome/dywoa/ui/activity/vpn/AuthSuccessActivity.java
+++ b/app/src/main/java/com/rehome/dywoa/ui/activity/vpn/AuthSuccessActivity.java
@@ -106,7 +106,7 @@ public class AuthSuccessActivity extends AppCompatActivity implements View.OnCli
 
         String[] str_extraResource_url = getResources().getStringArray(R.array.extra_resource_url);
         ArrayAdapter<String> arrayAdapter =
-                new ArrayAdapter<String>(AuthSuccessActivity.this, R.layout.support_simple_spinner_dropdown_item,
+                new ArrayAdapter<String>(AuthSuccessActivity.this, android.R.layout.simple_spinner_dropdown_item,
                         str_extraResource_url);
         mAutoCompleteTextView.setAdapter(arrayAdapter);
 
@@ -144,18 +144,27 @@ public class AuthSuccessActivity extends AppCompatActivity implements View.OnCli
             @Override
             public void onCheckedChanged(RadioGroup group, int checkedId) {
                 //监听认证按钮，动态改变布局显示
-                switch (mRadioGroup_authMethod.getCheckedRadioButtonId()) {
-                    case R.id.svpn_intraResource_tabheader:
-                        findViewById(R.id.et_url).setVisibility(View.VISIBLE);
-                        findViewById(R.id.autoComTextView_url).setVisibility(View.GONE);
-                        break;
-                    case R.id.svpn_extraResource_tabheader:
-                        findViewById(R.id.et_url).setVisibility(View.GONE);
-                        findViewById(R.id.autoComTextView_url).setVisibility(View.VISIBLE);
-                        break;
-                    default:
-                        break;
+                if(checkedId==R.id.svpn_intraResource_tabheader){
+                    findViewById(R.id.et_url).setVisibility(View.VISIBLE);
+                    findViewById(R.id.autoComTextView_url).setVisibility(View.GONE);
                 }
+                if(checkedId==R.id.svpn_extraResource_tabheader){
+                    findViewById(R.id.et_url).setVisibility(View.GONE);
+                    findViewById(R.id.autoComTextView_url).setVisibility(View.VISIBLE);
+                }
+
+//                switch (mRadioGroup_authMethod.getCheckedRadioButtonId()) {
+//                    case R.id.svpn_intraResource_tabheader:
+//                        findViewById(R.id.et_url).setVisibility(View.VISIBLE);
+//                        findViewById(R.id.autoComTextView_url).setVisibility(View.GONE);
+//                        break;
+//                    case R.id.svpn_extraResource_tabheader:
+//                        findViewById(R.id.et_url).setVisibility(View.GONE);
+//                        findViewById(R.id.autoComTextView_url).setVisibility(View.VISIBLE);
+//                        break;
+//                    default:
+//                        break;
+//                }
 
             }
         });
@@ -184,44 +193,74 @@ public class AuthSuccessActivity extends AppCompatActivity implements View.OnCli
 
     @Override
     public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.btn_test_res: {
-                doTestResource();
-                break;
-            }
-            case R.id.btn_logout: {
-                doVPNLogout();
-                break;
+        if(v.getId()==R.id.btn_test_res){
+            doTestResource();
+        }
+        if(v.getId()==R.id.btn_logout){
+            doVPNLogout();
+        }
+        if(v.getId()==R.id.btn_file){
+            entryFileTestPage();
+        }
+        if(v.getId()==R.id.btn_udp){
+            entryUdpPage();
+        }
+        if(v.getId()==R.id.btn_log){
+            entryLogTestPage();
+        }
+        if(v.getId()==R.id.btn_start_tunnel){
+            SFUemSDK.getInstance().getSFTunnel().startTunnel();
+        }
+        if(v.getId()==R.id.btn_stop_tunnel){
+            SFUemSDK.getInstance().getSFTunnel().stopTunnel();
+        }
+        if(v.getId()==R.id.btn_master_slave){
+
+        }
+        if(v.getId()==R.id.btn_modify_psw){
+            if (!SFUemSDK.getInstance().allowResetPassword()) {
+                Toast.makeText(AuthSuccessActivity.this, "当前不支持修改密码", Toast.LENGTH_SHORT).show();
+                return;
             }
-            case R.id.btn_file:
-                entryFileTestPage();
-                break;
-            case R.id.btn_udp:
-                entryUdpPage();
-                break;
-            case R.id.btn_log:
-                entryLogTestPage();
-                break;
-            case R.id.btn_start_tunnel:
-                SFUemSDK.getInstance().getSFTunnel().startTunnel();
-                break;
-
-            case R.id.btn_stop_tunnel:
-                SFUemSDK.getInstance().getSFTunnel().stopTunnel();
-                break;
-            case R.id.btn_master_slave:
-                //startActivity(new Intent(this, MasterSlaveTestActivity.class));
-                break;
-            case R.id.btn_modify_psw:
-                if (!SFUemSDK.getInstance().allowResetPassword()) {
-                    Toast.makeText(AuthSuccessActivity.this, "当前不支持修改密码", Toast.LENGTH_SHORT).show();
-                    return;
-                }
-                //startActivity(new Intent(this, ModifyPswActivity.class));
-                break;
-            default:
-                break;
         }
+//        switch (v.getId()) {
+//            case R.id.btn_test_res: {
+//                doTestResource();
+//                break;
+//            }
+//            case R.id.btn_logout: {
+//                doVPNLogout();
+//                break;
+//            }
+//            case R.id.btn_file:
+//                entryFileTestPage();
+//                break;
+//            case R.id.btn_udp:
+//                entryUdpPage();
+//                break;
+//            case R.id.btn_log:
+//                entryLogTestPage();
+//                break;
+//            case R.id.btn_start_tunnel:
+//                SFUemSDK.getInstance().getSFTunnel().startTunnel();
+//                break;
+//
+//            case R.id.btn_stop_tunnel:
+//                SFUemSDK.getInstance().getSFTunnel().stopTunnel();
+//                break;
+//            case R.id.btn_master_slave:
+//                //startActivity(new Intent(this, MasterSlaveTestActivity.class));
+//                break;
+//            case R.id.btn_modify_psw:
+//                if (!SFUemSDK.getInstance().allowResetPassword()) {
+//                    Toast.makeText(AuthSuccessActivity.this, "当前不支持修改密码", Toast.LENGTH_SHORT).show();
+//                    return;
+//                }
+//                //startActivity(new Intent(this, ModifyPswActivity.class));
+//                break;
+//            default:
+//                break;
+//        }
     }
 
     private void entryUdpPage() {
diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/vpn/PrimaryAuthActivity.java b/app/src/main/java/com/rehome/dywoa/ui/activity/vpn/PrimaryAuthActivity.java
index 88fba04..0db6d6e 100644
--- a/app/src/main/java/com/rehome/dywoa/ui/activity/vpn/PrimaryAuthActivity.java
+++ b/app/src/main/java/com/rehome/dywoa/ui/activity/vpn/PrimaryAuthActivity.java
@@ -158,19 +158,27 @@ public class PrimaryAuthActivity extends BaseActivity implements SFAuthResultLis
 
     @Override
     public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.svpn_login_button: {
-                mServerAddress = mServerAddressEditText.getText().toString();
-                mUserName = mUserNameEditView.getText().toString();
-                mUserPassword = mUserPasswordEditView.getText().toString();
-
-                //开始主认证
-                startPrimaryAuth();
-                break;
-            }
-            default:
-                break;
+        if(v.getId()==R.id.svpn_login_button){
+            mServerAddress = mServerAddressEditText.getText().toString();
+            mUserName = mUserNameEditView.getText().toString();
+            mUserPassword = mUserPasswordEditView.getText().toString();
+
+            //开始主认证
+            startPrimaryAuth();
         }
+//        switch (v.getId()) {
+//            case R.id.svpn_login_button: {
+//                mServerAddress = mServerAddressEditText.getText().toString();
+//                mUserName = mUserNameEditView.getText().toString();
+//                mUserPassword = mUserPasswordEditView.getText().toString();
+//
+//                //开始主认证
+//                startPrimaryAuth();
+//                break;
+//            }
+//            default:
+//                break;
+//        }
     }
 
     //开始用户名密码认证
@@ -324,10 +332,10 @@ public class PrimaryAuthActivity extends BaseActivity implements SFAuthResultLis
             @Override
             public void run() {
                 Dialog messageDialog = new AlertDialog.Builder(PrimaryAuthActivity.this)
-                        .setTitle(PrimaryAuthActivity.this.getString(R.string.info))
+                        .setTitle(PrimaryAuthActivity.this.getString(com.sangfor.sdk.R.string.info))
                         .setMessage(errMsg)
                         .setIcon(android.R.drawable.ic_dialog_alert)
-                        .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+                        .setPositiveButton(com.sangfor.sdk.R.string.ok, new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
                                 dialog.dismiss();
diff --git a/app/src/main/java/com/rehome/dywoa/ui/fragment/HomeFragment.java b/app/src/main/java/com/rehome/dywoa/ui/fragment/HomeFragment.java
index a8fa3e0..3739467 100644
--- a/app/src/main/java/com/rehome/dywoa/ui/fragment/HomeFragment.java
+++ b/app/src/main/java/com/rehome/dywoa/ui/fragment/HomeFragment.java
@@ -208,7 +208,7 @@ public class HomeFragment extends BaseFragment {
                         startActivity(intentJiZhu);
                         break;
                     case 3:
-                        if((firstDeparment!=null&&firstDeparment.equals("运行部"))||(firstDeparment!=null&&firstDeparment.equals("承包商"))||(username!=null&&username.equals("371522"))){
+                        if((firstDeparment!=null&&firstDeparment.equals("运行部"))||(firstDeparment!=null&&firstDeparment.equals("承包商"))||(username!=null&&username.equals("371522"))||(username!=null&&username.equals("ceshi1"))){
                             Intent intentXj= new Intent(mActivity, XscbglActivity.class);
                             intentXj.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
                             startActivity(intentXj);
diff --git a/app/src/main/java/com/rehome/dywoa/zxing/decoding/CaptureActivityHandler.java b/app/src/main/java/com/rehome/dywoa/zxing/decoding/CaptureActivityHandler.java
index 049f628..d65e72c 100755
--- a/app/src/main/java/com/rehome/dywoa/zxing/decoding/CaptureActivityHandler.java
+++ b/app/src/main/java/com/rehome/dywoa/zxing/decoding/CaptureActivityHandler.java
@@ -49,48 +49,85 @@ public final class CaptureActivityHandler extends Handler {
 
     @Override
     public void handleMessage(Message message) {
-        switch (message.what) {
-            case R.id.auto_focus:
-                //Log.d(TAG, "Got auto-focus message");
-                // When one auto focus pass finishes, start another. This is the closest thing to
-                // continuous AF. It does seem to hunt background bit, but I'm not sure what else to do.
-                if (state == State.PREVIEW) {
-                    CameraManager.get().requestAutoFocus(this, R.id.auto_focus);
-                }
-                break;
-            case R.id.restart_preview:
-                Log.d(TAG, "Got restart preview message");
-                restartPreviewAndDecode();
-                break;
-            case R.id.decode_succeeded:
-                Log.d(TAG, "Got decode succeeded message");
-                state = State.SUCCESS;
-                Bundle bundle = message.getData();
-
-                /***********************************************************************/
-                Bitmap barcode = bundle == null ? null :
-                        (Bitmap) bundle.getParcelable(DecodeThread.BARCODE_BITMAP);//���ñ����߳�
-
-                activity.handleDecode((Result) message.obj, barcode);//���ؽ��?        /***********************************************************************/
-                break;
-            case R.id.decode_failed:
-                // We're decoding as fast as possible, so when one decode fails, start another.
-                state = State.PREVIEW;
-                CameraManager.get().requestPreviewFrame(decodeThread.getHandler(), R.id.decode);
-                break;
-            case R.id.return_scan_result:
-                Log.d(TAG, "Got return scan result message");
-                activity.setResult(Activity.RESULT_OK, (Intent) message.obj);
-                activity.finish();
-                break;
-            case R.id.launch_product_query:
-                Log.d(TAG, "Got product query message");
-                String url = (String) message.obj;
-                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
-                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
-                activity.startActivity(intent);
-                break;
+        if(message.what==R.id.auto_focus){
+            if (state == State.PREVIEW) {
+                CameraManager.get().requestAutoFocus(this, R.id.auto_focus);
+            }
         }
+        if(message.what==R.id.restart_preview){
+            Log.d(TAG, "Got restart preview message");
+            restartPreviewAndDecode();
+        }
+        if(message.what==R.id.decode_succeeded){
+            Log.d(TAG, "Got decode succeeded message");
+            state = State.SUCCESS;
+            Bundle bundle = message.getData();
+
+            /***********************************************************************/
+            Bitmap barcode = bundle == null ? null :
+                    (Bitmap) bundle.getParcelable(DecodeThread.BARCODE_BITMAP);//���ñ����߳�
+
+            activity.handleDecode((Result) message.obj, barcode);
+            /***********************************************************************/
+        }
+        if(message.what==R.id.decode_failed){
+            state = State.PREVIEW;
+            CameraManager.get().requestPreviewFrame(decodeThread.getHandler(), R.id.decode);
+        }
+        if(message.what==R.id.return_scan_result){
+            Log.d(TAG, "Got return scan result message");
+            activity.setResult(Activity.RESULT_OK, (Intent) message.obj);
+            activity.finish();
+        }
+        if(message.what==R.id.launch_product_query){
+            Log.d(TAG, "Got product query message");
+            String url = (String) message.obj;
+            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
+            activity.startActivity(intent);
+        }
+//        switch (message.what) {
+//            case R.id.auto_focus:
+//                //Log.d(TAG, "Got auto-focus message");
+//                // When one auto focus pass finishes, start another. This is the closest thing to
+//                // continuous AF. It does seem to hunt background bit, but I'm not sure what else to do.
+//                if (state == State.PREVIEW) {
+//                    CameraManager.get().requestAutoFocus(this, R.id.auto_focus);
+//                }
+//                break;
+//            case R.id.restart_preview:
+//                Log.d(TAG, "Got restart preview message");
+//                restartPreviewAndDecode();
+//                break;
+//            case R.id.decode_succeeded:
+//                Log.d(TAG, "Got decode succeeded message");
+//                state = State.SUCCESS;
+//                Bundle bundle = message.getData();
+//
+//                /***********************************************************************/
+//                Bitmap barcode = bundle == null ? null :
+//                        (Bitmap) bundle.getParcelable(DecodeThread.BARCODE_BITMAP);//���ñ����߳�
+//
+//                activity.handleDecode((Result) message.obj, barcode);//���ؽ��?        /***********************************************************************/
+//                break;
+//            case R.id.decode_failed:
+//                // We're decoding as fast as possible, so when one decode fails, start another.
+//                state = State.PREVIEW;
+//                CameraManager.get().requestPreviewFrame(decodeThread.getHandler(), R.id.decode);
+//                break;
+//            case R.id.return_scan_result:
+//                Log.d(TAG, "Got return scan result message");
+//                activity.setResult(Activity.RESULT_OK, (Intent) message.obj);
+//                activity.finish();
+//                break;
+//            case R.id.launch_product_query:
+//                Log.d(TAG, "Got product query message");
+//                String url = (String) message.obj;
+//                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+//                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
+//                activity.startActivity(intent);
+//                break;
+//        }
     }
 
     public void quitSynchronously() {
diff --git a/app/src/main/java/com/rehome/dywoa/zxing/decoding/DecodeHandler.java b/app/src/main/java/com/rehome/dywoa/zxing/decoding/DecodeHandler.java
index ceea540..d483c36 100755
--- a/app/src/main/java/com/rehome/dywoa/zxing/decoding/DecodeHandler.java
+++ b/app/src/main/java/com/rehome/dywoa/zxing/decoding/DecodeHandler.java
@@ -35,15 +35,21 @@ final class DecodeHandler extends Handler {
 
     @Override
     public void handleMessage(Message message) {
-        switch (message.what) {
-            case R.id.decode:
-                //Log.d(TAG, "Got decode message");
-                decode((byte[]) message.obj, message.arg1, message.arg2);
-                break;
-            case R.id.quit:
-                Looper.myLooper().quit();
-                break;
+        if(message.what==R.id.decode){
+            decode((byte[]) message.obj, message.arg1, message.arg2);
         }
+        if(message.what==R.id.quit){
+            Looper.myLooper().quit();
+        }
+//        switch (message.what) {
+//            case R.id.decode:
+//                //Log.d(TAG, "Got decode message");
+//                decode((byte[]) message.obj, message.arg1, message.arg2);
+//                break;
+//            case R.id.quit:
+//                Looper.myLooper().quit();
+//                break;
+//        }
     }
 
     /**
diff --git a/autolayout/build.gradle b/autolayout/build.gradle
index 7abf869..20a3b29 100644
--- a/autolayout/build.gradle
+++ b/autolayout/build.gradle
@@ -5,7 +5,6 @@ android {
     defaultConfig {
         minSdk 24
         targetSdk 34
-        versionName "1.4.5"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/build.gradle b/build.gradle
index dda53d7..fcf0af7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.4.0' apply false
+    id 'com.android.application' version '8.6.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
 }
diff --git a/gradle.properties b/gradle.properties
index 2b1cd7f..1bbfa78 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,6 +15,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
+android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
@@ -24,6 +25,6 @@ kotlin.code.style=official
 
 
 #android.defaults.buildfeatures.buildconfig=true
-android.enableJetifier=true
-android.nonFinalResIds=false
-android.nonTransitiveRClass=false
+
+#android.nonFinalResIds=false
+#android.nonTransitiveRClass=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index deff33a..a7a24a6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Oct 23 10:17:58 GMT+08:00 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/litepal/build.gradle b/litepal/build.gradle
index 7d6d32b..00428e4 100644
--- a/litepal/build.gradle
+++ b/litepal/build.gradle
@@ -5,7 +5,6 @@ android {
     defaultConfig {
         minSdk 24
         targetSdk 34
-        versionName "1.5.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/matisse/build.gradle b/matisse/build.gradle
index b943b65..951e7f3 100644
--- a/matisse/build.gradle
+++ b/matisse/build.gradle
@@ -6,7 +6,6 @@ android {
     defaultConfig {
         minSdk 24
         targetSdk 34
-        versionName "0.5.3-beta3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/nohttp/build.gradle b/nohttp/build.gradle
index 9ee441b..bf1029b 100644
--- a/nohttp/build.gradle
+++ b/nohttp/build.gradle
@@ -5,7 +5,6 @@ android {
     defaultConfig {
         minSdk 24
         targetSdk 34
-        versionName "1.0.5"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/settings.gradle b/settings.gradle
index 1396892..95a7039 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,13 @@
 pluginManagement {
     repositories {
-        google()
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
+        //google()
         mavenCentral()
         gradlePluginPortal()
         jcenter()
@@ -13,7 +20,7 @@ dependencyResolutionManagement {
         mavenCentral()
         jcenter()
         maven {url "https://jitpack.io"}
-        maven {url 'https://maven.google.com'}
+        //maven {url 'https://maven.google.com'}
     }
 }
 
diff --git a/tkrefreshlayout/build.gradle b/tkrefreshlayout/build.gradle
index f14bf47..d847c3d 100644
--- a/tkrefreshlayout/build.gradle
+++ b/tkrefreshlayout/build.gradle
@@ -5,7 +5,6 @@ android {
     defaultConfig {
         minSdk 24
         targetSdk 34
-        versionName "1.07"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {