移除掉资源R类id传递

master
admin-pc\admin 1 year ago
parent d185ba4e5f
commit eefb623bc0

@ -26,6 +26,7 @@ import com.luck.picture.lib.utils.DateUtils;
import com.rehome.dywoa.Listener.OnItemLongClickListener; import com.rehome.dywoa.Listener.OnItemLongClickListener;
import com.rehome.dywoa.R; import com.rehome.dywoa.R;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -164,15 +165,15 @@ public class GridImageAdapter extends RecyclerView.Adapter<GridImageAdapter.View
if (chooseModel == SelectMimeType.ofAudio()) { if (chooseModel == SelectMimeType.ofAudio()) {
viewHolder.tvDuration.setVisibility(View.VISIBLE); viewHolder.tvDuration.setVisibility(View.VISIBLE);
viewHolder.tvDuration.setCompoundDrawablesRelativeWithIntrinsicBounds viewHolder.tvDuration.setCompoundDrawablesRelativeWithIntrinsicBounds
(R.drawable.ps_ic_audio, 0, 0, 0); (com.luck.picture.lib.R.drawable.ps_ic_audio, 0, 0, 0);
} else { } else {
viewHolder.tvDuration.setCompoundDrawablesRelativeWithIntrinsicBounds 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)); viewHolder.tvDuration.setText(DateUtils.formatDurationTime(duration));
if (chooseModel == SelectMimeType.ofAudio()) { 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 { } else {
Glide.with(viewHolder.itemView.getContext()) Glide.with(viewHolder.itemView.getContext())
.load(PictureMimeType.isContent(path) && !media.isCut() && !media.isCompressed() ? Uri.parse(path) .load(PictureMimeType.isContent(path) && !media.isCut() && !media.isCompressed() ? Uri.parse(path)

@ -188,12 +188,12 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
if (isApkInDebug(context)) { if (isApkInDebug(context)) {
//测试 //测试
binding.etUsername.setText("371522") // binding.etUsername.setText("371522")
binding.etPassword.setText("A000000a") // binding.etPassword.setText("A000000a")
//ceshi1 //ceshi1
// binding.etUsername.setText("ceshi1") binding.etUsername.setText("ceshi1")
// binding.etPassword.setText("A000000a") binding.etPassword.setText("A000000a")
// binding.etUsername.setText("CY00011") // binding.etUsername.setText("CY00011")
// binding.etPassword.setText("A000000a") // binding.etPassword.setText("A000000a")

@ -98,18 +98,28 @@ public class AjhFragment extends BaseFragment {
@Override @Override
public void onCheckedChanged(RadioGroup group, int checkedId) { public void onCheckedChanged(RadioGroup group, int checkedId) {
switch (checkedId) { if(checkedId==R.id.rb1){
case R.id.rb1:
rb1.setTextColor(getResources().getColor(R.color.btn)); rb1.setTextColor(getResources().getColor(R.color.btn));
rb2.setTextColor(Color.GRAY); rb2.setTextColor(Color.GRAY);
vp.setCurrentItem(0, false); vp.setCurrentItem(0, false);
break; }
case R.id.rb2: if(checkedId==R.id.rb2){
rb2.setTextColor(getResources().getColor(R.color.btn)); rb2.setTextColor(getResources().getColor(R.color.btn));
rb1.setTextColor(Color.GRAY); rb1.setTextColor(Color.GRAY);
vp.setCurrentItem(1, false); vp.setCurrentItem(1, false);
break;
} }
// 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;
// }
} }
}); });
} }

@ -102,26 +102,44 @@ public class SbdjFragment extends BaseFragment {
rg.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { rg.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(RadioGroup radioGroup, int i) { public void onCheckedChanged(RadioGroup radioGroup, int i) {
switch (i) { if(i==R.id.rb1){
case R.id.rb1:
rb1.setTextColor(Color.WHITE); rb1.setTextColor(Color.WHITE);
rb2.setTextColor(Color.GRAY); rb2.setTextColor(Color.GRAY);
rb3.setTextColor(Color.GRAY); rb3.setTextColor(Color.GRAY);
vp.setCurrentItem(0, false); vp.setCurrentItem(0, false);
break; }
case R.id.rb2: if(i==R.id.rb2){
rb1.setTextColor(Color.GRAY); rb1.setTextColor(Color.GRAY);
rb2.setTextColor(Color.WHITE); rb2.setTextColor(Color.WHITE);
rb3.setTextColor(Color.GRAY); rb3.setTextColor(Color.GRAY);
vp.setCurrentItem(1, false); vp.setCurrentItem(1, false);
break; }
case R.id.rb3: if(i==R.id.rb3){
rb1.setTextColor(Color.GRAY); rb1.setTextColor(Color.GRAY);
rb2.setTextColor(Color.GRAY); rb2.setTextColor(Color.GRAY);
rb3.setTextColor(Color.WHITE); rb3.setTextColor(Color.WHITE);
vp.setCurrentItem(2, false); vp.setCurrentItem(2, false);
break;
} }
// 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;
// }
} }
} }
); );

@ -589,19 +589,19 @@ public class RecordEventActivity extends BaseActivityViewBinding<ActivityRecordE
options.setStatusBarColor(statusBarColor); options.setStatusBarColor(statusBarColor);
options.setToolbarColor(statusBarColor); options.setToolbarColor(statusBarColor);
} else { } else {
options.setStatusBarColor(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(), R.color.ps_color_grey)); options.setToolbarColor(ContextCompat.getColor(getContext(), com.luck.picture.lib.R.color.ps_color_grey));
} }
TitleBarStyle titleBarStyle = selectorStyle.getTitleBarStyle(); TitleBarStyle titleBarStyle = selectorStyle.getTitleBarStyle();
if (StyleUtils.checkStyleValidity(titleBarStyle.getTitleTextColor())) { if (StyleUtils.checkStyleValidity(titleBarStyle.getTitleTextColor())) {
options.setToolbarWidgetColor(titleBarStyle.getTitleTextColor()); options.setToolbarWidgetColor(titleBarStyle.getTitleTextColor());
} else { } 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 { } else {
options.setStatusBarColor(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(), R.color.ps_color_grey)); options.setToolbarColor(ContextCompat.getColor(getContext(), com.luck.picture.lib.R.color.ps_color_grey));
options.setToolbarWidgetColor(ContextCompat.getColor(getContext(), R.color.ps_color_white)); options.setToolbarWidgetColor(ContextCompat.getColor(getContext(), com.luck.picture.lib.R.color.ps_color_white));
} }
return options; return options;
} }

@ -283,26 +283,45 @@ public class SbxjcjsbActivity extends BaseActivity {
@Override @Override
public void onCheckedChanged(RadioGroup radioGroup, int i) { public void onCheckedChanged(RadioGroup radioGroup, int i) {
switch (i) { if(i==R.id.rb1){
case R.id.rb1:
rb1.setTextColor(Color.WHITE); rb1.setTextColor(Color.WHITE);
rb2.setTextColor(Color.GRAY); rb2.setTextColor(Color.GRAY);
rb3.setTextColor(Color.GRAY); rb3.setTextColor(Color.GRAY);
vp.setCurrentItem(0, false); vp.setCurrentItem(0, false);
break; }
case R.id.rb2: if(i==R.id.rb2){
rb1.setTextColor(Color.GRAY); rb1.setTextColor(Color.GRAY);
rb2.setTextColor(Color.WHITE); rb2.setTextColor(Color.WHITE);
rb3.setTextColor(Color.GRAY); rb3.setTextColor(Color.GRAY);
vp.setCurrentItem(1, false); vp.setCurrentItem(1, false);
break; }
case R.id.rb3: if(i==R.id.rb3){
rb1.setTextColor(Color.GRAY); rb1.setTextColor(Color.GRAY);
rb2.setTextColor(Color.GRAY); rb2.setTextColor(Color.GRAY);
rb3.setTextColor(Color.WHITE); rb3.setTextColor(Color.WHITE);
vp.setCurrentItem(2, false); vp.setCurrentItem(2, false);
break;
} }
// 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;
// }
} }
}); });
} }

@ -106,7 +106,7 @@ public class AuthSuccessActivity extends AppCompatActivity implements View.OnCli
String[] str_extraResource_url = getResources().getStringArray(R.array.extra_resource_url); String[] str_extraResource_url = getResources().getStringArray(R.array.extra_resource_url);
ArrayAdapter<String> arrayAdapter = 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); str_extraResource_url);
mAutoCompleteTextView.setAdapter(arrayAdapter); mAutoCompleteTextView.setAdapter(arrayAdapter);
@ -144,19 +144,28 @@ public class AuthSuccessActivity extends AppCompatActivity implements View.OnCli
@Override @Override
public void onCheckedChanged(RadioGroup group, int checkedId) { public void onCheckedChanged(RadioGroup group, int checkedId) {
//监听认证按钮,动态改变布局显示 //监听认证按钮,动态改变布局显示
switch (mRadioGroup_authMethod.getCheckedRadioButtonId()) { if(checkedId==R.id.svpn_intraResource_tabheader){
case R.id.svpn_intraResource_tabheader:
findViewById(R.id.et_url).setVisibility(View.VISIBLE); findViewById(R.id.et_url).setVisibility(View.VISIBLE);
findViewById(R.id.autoComTextView_url).setVisibility(View.GONE); findViewById(R.id.autoComTextView_url).setVisibility(View.GONE);
break; }
case R.id.svpn_extraResource_tabheader: if(checkedId==R.id.svpn_extraResource_tabheader){
findViewById(R.id.et_url).setVisibility(View.GONE); findViewById(R.id.et_url).setVisibility(View.GONE);
findViewById(R.id.autoComTextView_url).setVisibility(View.VISIBLE); findViewById(R.id.autoComTextView_url).setVisibility(View.VISIBLE);
break;
default:
break;
} }
// 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 @Override
public void onClick(View v) { public void onClick(View v) {
switch (v.getId()) { if(v.getId()==R.id.btn_test_res){
case R.id.btn_test_res: {
doTestResource(); doTestResource();
break;
} }
case R.id.btn_logout: { if(v.getId()==R.id.btn_logout){
doVPNLogout(); doVPNLogout();
break;
} }
case R.id.btn_file: if(v.getId()==R.id.btn_file){
entryFileTestPage(); entryFileTestPage();
break; }
case R.id.btn_udp: if(v.getId()==R.id.btn_udp){
entryUdpPage(); entryUdpPage();
break; }
case R.id.btn_log: if(v.getId()==R.id.btn_log){
entryLogTestPage(); entryLogTestPage();
break; }
case R.id.btn_start_tunnel: if(v.getId()==R.id.btn_start_tunnel){
SFUemSDK.getInstance().getSFTunnel().startTunnel(); SFUemSDK.getInstance().getSFTunnel().startTunnel();
break; }
if(v.getId()==R.id.btn_stop_tunnel){
case R.id.btn_stop_tunnel:
SFUemSDK.getInstance().getSFTunnel().stopTunnel(); SFUemSDK.getInstance().getSFTunnel().stopTunnel();
break; }
case R.id.btn_master_slave: if(v.getId()==R.id.btn_master_slave){
//startActivity(new Intent(this, MasterSlaveTestActivity.class));
break; }
case R.id.btn_modify_psw: if(v.getId()==R.id.btn_modify_psw){
if (!SFUemSDK.getInstance().allowResetPassword()) { if (!SFUemSDK.getInstance().allowResetPassword()) {
Toast.makeText(AuthSuccessActivity.this, "当前不支持修改密码", Toast.LENGTH_SHORT).show(); Toast.makeText(AuthSuccessActivity.this, "当前不支持修改密码", Toast.LENGTH_SHORT).show();
return; 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() { private void entryUdpPage() {

@ -158,19 +158,27 @@ public class PrimaryAuthActivity extends BaseActivity implements SFAuthResultLis
@Override @Override
public void onClick(View v) { public void onClick(View v) {
switch (v.getId()) { if(v.getId()==R.id.svpn_login_button){
case R.id.svpn_login_button: {
mServerAddress = mServerAddressEditText.getText().toString(); mServerAddress = mServerAddressEditText.getText().toString();
mUserName = mUserNameEditView.getText().toString(); mUserName = mUserNameEditView.getText().toString();
mUserPassword = mUserPasswordEditView.getText().toString(); mUserPassword = mUserPasswordEditView.getText().toString();
//开始主认证 //开始主认证
startPrimaryAuth(); startPrimaryAuth();
break;
}
default:
break;
} }
// 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 @Override
public void run() { public void run() {
Dialog messageDialog = new AlertDialog.Builder(PrimaryAuthActivity.this) 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) .setMessage(errMsg)
.setIcon(android.R.drawable.ic_dialog_alert) .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 @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
dialog.dismiss(); dialog.dismiss();

@ -208,7 +208,7 @@ public class HomeFragment extends BaseFragment {
startActivity(intentJiZhu); startActivity(intentJiZhu);
break; break;
case 3: 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); Intent intentXj= new Intent(mActivity, XscbglActivity.class);
intentXj.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); intentXj.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
startActivity(intentXj); startActivity(intentXj);

@ -49,20 +49,16 @@ public final class CaptureActivityHandler extends Handler {
@Override @Override
public void handleMessage(Message message) { public void handleMessage(Message message) {
switch (message.what) { if(message.what==R.id.auto_focus){
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) { if (state == State.PREVIEW) {
CameraManager.get().requestAutoFocus(this, R.id.auto_focus); CameraManager.get().requestAutoFocus(this, R.id.auto_focus);
} }
break; }
case R.id.restart_preview: if(message.what==R.id.restart_preview){
Log.d(TAG, "Got restart preview message"); Log.d(TAG, "Got restart preview message");
restartPreviewAndDecode(); restartPreviewAndDecode();
break; }
case R.id.decode_succeeded: if(message.what==R.id.decode_succeeded){
Log.d(TAG, "Got decode succeeded message"); Log.d(TAG, "Got decode succeeded message");
state = State.SUCCESS; state = State.SUCCESS;
Bundle bundle = message.getData(); Bundle bundle = message.getData();
@ -71,26 +67,67 @@ public final class CaptureActivityHandler extends Handler {
Bitmap barcode = bundle == null ? null : Bitmap barcode = bundle == null ? null :
(Bitmap) bundle.getParcelable(DecodeThread.BARCODE_BITMAP);//<2F><><EFBFBD>ñ<EFBFBD><C3B1><EFBFBD><EFBFBD>߳<EFBFBD> (Bitmap) bundle.getParcelable(DecodeThread.BARCODE_BITMAP);//<2F><><EFBFBD>ñ<EFBFBD><C3B1><EFBFBD><EFBFBD>߳<EFBFBD>
activity.handleDecode((Result) message.obj, barcode);//<2F><><EFBFBD>ؽ<EFBFBD><D8BD>? /***********************************************************************/ 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. if(message.what==R.id.decode_failed){
state = State.PREVIEW; state = State.PREVIEW;
CameraManager.get().requestPreviewFrame(decodeThread.getHandler(), R.id.decode); CameraManager.get().requestPreviewFrame(decodeThread.getHandler(), R.id.decode);
break; }
case R.id.return_scan_result: if(message.what==R.id.return_scan_result){
Log.d(TAG, "Got return scan result message"); Log.d(TAG, "Got return scan result message");
activity.setResult(Activity.RESULT_OK, (Intent) message.obj); activity.setResult(Activity.RESULT_OK, (Intent) message.obj);
activity.finish(); activity.finish();
break; }
case R.id.launch_product_query: if(message.what==R.id.launch_product_query){
Log.d(TAG, "Got product query message"); Log.d(TAG, "Got product query message");
String url = (String) message.obj; String url = (String) message.obj;
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
activity.startActivity(intent); activity.startActivity(intent);
break;
} }
// 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);//<2F><><EFBFBD>ñ<EFBFBD><C3B1><EFBFBD><EFBFBD>߳<EFBFBD>
//
// activity.handleDecode((Result) message.obj, barcode);//<2F><><EFBFBD>ؽ<EFBFBD><D8BD>? /***********************************************************************/
// 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() { public void quitSynchronously() {

@ -35,15 +35,21 @@ final class DecodeHandler extends Handler {
@Override @Override
public void handleMessage(Message message) { public void handleMessage(Message message) {
switch (message.what) { if(message.what==R.id.decode){
case R.id.decode:
//Log.d(TAG, "Got decode message");
decode((byte[]) message.obj, message.arg1, message.arg2); decode((byte[]) message.obj, message.arg1, message.arg2);
break; }
case R.id.quit: if(message.what==R.id.quit){
Looper.myLooper().quit(); Looper.myLooper().quit();
break;
} }
// 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;
// }
} }
/** /**

@ -5,7 +5,6 @@ android {
defaultConfig { defaultConfig {
minSdk 24 minSdk 24
targetSdk 34 targetSdk 34
versionName "1.4.5"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
buildTypes { buildTypes {

@ -1,5 +1,5 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins { 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 id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
} }

@ -15,6 +15,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
# Android operating system, and which are packaged with your app's APK # Android operating system, and which are packaged with your app's APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn # https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete": # Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official kotlin.code.style=official
# Enables namespacing of each library's R class so that its R class includes only the # 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.defaults.buildfeatures.buildconfig=true
android.enableJetifier=true
android.nonFinalResIds=false #android.nonFinalResIds=false
android.nonTransitiveRClass=false #android.nonTransitiveRClass=false

@ -1,6 +1,6 @@
#Mon Oct 23 10:17:58 GMT+08:00 2023 #Mon Oct 23 10:17:58 GMT+08:00 2023
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

@ -5,7 +5,6 @@ android {
defaultConfig { defaultConfig {
minSdk 24 minSdk 24
targetSdk 34 targetSdk 34
versionName "1.5.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
buildTypes { buildTypes {

@ -6,7 +6,6 @@ android {
defaultConfig { defaultConfig {
minSdk 24 minSdk 24
targetSdk 34 targetSdk 34
versionName "0.5.3-beta3"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
buildTypes { buildTypes {

@ -5,7 +5,6 @@ android {
defaultConfig { defaultConfig {
minSdk 24 minSdk 24
targetSdk 34 targetSdk 34
versionName "1.0.5"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
buildTypes { buildTypes {

@ -1,6 +1,13 @@
pluginManagement { pluginManagement {
repositories { repositories {
google() google {
content {
includeGroupByRegex("com\\.android.*")
includeGroupByRegex("com\\.google.*")
includeGroupByRegex("androidx.*")
}
}
//google()
mavenCentral() mavenCentral()
gradlePluginPortal() gradlePluginPortal()
jcenter() jcenter()
@ -13,7 +20,7 @@ dependencyResolutionManagement {
mavenCentral() mavenCentral()
jcenter() jcenter()
maven {url "https://jitpack.io"} maven {url "https://jitpack.io"}
maven {url 'https://maven.google.com'} //maven {url 'https://maven.google.com'}
} }
} }

@ -5,7 +5,6 @@ android {
defaultConfig { defaultConfig {
minSdk 24 minSdk 24
targetSdk 34 targetSdk 34
versionName "1.07"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
buildTypes { buildTypes {

Loading…
Cancel
Save