From: snickersun Date: Wed, 13 Jan 2021 03:00:05 +0000 (+0800) Subject: 重力测试通过值调大，解决微小数值跳动会干扰测试结果的问题。 X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=da19ce49e315b85c9af854c33eaa322bf380767d;p=factoryMode.git 重力测试通过值调大，解决微小数值跳动会干扰测试结果的问题。 --- diff --git a/app/src/main/java/mobile/miki/GravitySensorActivity.java b/app/src/main/java/mobile/miki/GravitySensorActivity.java index 0ee06cc..bf10744 100644 --- a/app/src/main/java/mobile/miki/GravitySensorActivity.java +++ b/app/src/main/java/mobile/miki/GravitySensorActivity.java @@ -1,210 +1,210 @@ -/** - * Generated by smali2java 1.0.0.558 - * Copyright (C) 2013 Hensence.com - */ - -package mobile.miki; - -import android.content.Context; -import android.content.Intent; -import android.hardware.Sensor; -import android.hardware.SensorEvent; -import android.hardware.SensorEventListener; -import android.hardware.SensorManager; -import android.os.Bundle; -import android.os.Handler; -import android.os.Message; -import android.preference.PreferenceManager; -import android.util.Log; -import android.view.View; -import android.widget.ImageView; -import android.widget.TextView; -import android.widget.Toast; - -import mobile.miki.mainui.ButtonViewTwo; -import mobile.miki.mainui.TestMainActivity; -import mobile.miki.mainui.TestMainList; -import mobile.miki.util.Config; - -public class GravitySensorActivity extends BaseActivity - implements SensorEventListener, android.view.View.OnClickListener { - private SensorManager sensorManager; - boolean gb_up = false; - boolean gb_left = false; - boolean gb_right = false; - boolean gb_down = false; - ImageView gs_up; - ImageView gs_left; - ImageView gs_right; - ImageView gs_down; - String s1; - TextView t1; - private ButtonViewTwo buttonView; - boolean running; - boolean pcbatest; - TextView xyzValue; - - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - MyApplication.getInstance().addActivity(this); - s1 = getString(R.string.ins_gsensor_toast); - setContentView(R.layout.gravity_sensor_layout); - Intent intent = getIntent(); - running = false; - pcbatest = false; - if (intent != null) { - running = intent.getBooleanExtra("running", false); - pcbatest = intent.getBooleanExtra("pcbatest",false); - } - buttonView = (ButtonViewTwo) findViewById(R.id.btn_set); - buttonView.btn_left.setOnClickListener(this); - buttonView.btn_right.setOnClickListener(this); - - //pcba测试的话，可以直接看数值人工测试是否成功。 - if (pcbatest) { - buttonView.btn_left.setClickable(true); - buttonView.setSuccessColor(); - }else{ - buttonView.btn_left.setClickable(false); - } - gs_up = (ImageView) findViewById(R.id.img_gsu); - - gs_left = (ImageView) findViewById(R.id.img_gsl); - - gs_right = (ImageView) findViewById(R.id.img_gsr); - - gs_down = (ImageView) findViewById(R.id.img_gsd); - t1 = (TextView) findViewById(R.id.ins); - xyzValue = (TextView) findViewById(R.id.xyz_value); - sensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE); - sensorManager.registerListener(this, sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER), 0x0); - handler.sendEmptyMessageDelayed(0, 500); - } - - public void onAccuracyChanged(Sensor sensor, int accuracy) { - } - - public void onSensorChanged(SensorEvent event) { - Log.i("dxc", "onSensorChanged x:" + event.values[0x0] + " y:" + event.values[0x1] + " z:" + event.values[0x2]); - xyzValue.setText("x:" + String .format("%.2f",event.values[0x0]) + " ,y:" + String .format("%.2f",event.values[0x1]) + " ,z:" + String .format("%.2f",event.values[0x2])); - ((TextView) findViewById(R.id.tvGraX)).setText(String.valueOf(event.values[0x0])); - ((TextView) findViewById(R.id.tvGraY)).setText(String.valueOf(event.values[0x1])); - ((TextView) findViewById(R.id.tvGraZ)).setText(String.valueOf(event.values[0x2])); - if (event.values[0x0] > 4.0 && !gb_left) { - gs_left.setImageResource(R.drawable.gs_2_l); - gb_left = true; - } else if (event.values[0x0] < -4.0 && !gb_right) { - gs_right.setImageResource(R.drawable.gs_2_r); - gb_right = true; - } else if (event.values[0x1] > 5.0 && !gb_down) { - gs_down.setImageResource(R.drawable.gs_2_d); - gb_down = true; - } else if (event.values[0x1] < -3.0 && !gb_up) { - gs_up.setImageResource(R.drawable.gs_2_u); - gb_up = true; - } - } - - protected void onDestroy() { - sensorManager.unregisterListener(this, sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER)); - sensorManager = null; - super.onDestroy(); - } - - - @Override - public void onClick(View arg0) { - Intent intent = Config.getNextTestIntent(this,this.getClass());//new Intent(this, BatteryTestActivity.class); - intent.putExtra("running", true); - intent.putExtra("pcbatest",pcbatest); - Intent intent1 = new Intent(this, TestMainActivity.class); - // TestResult testResult = (TestResult) getApplicationContext(); - switch (arg0.getId()) { - - case R.id.btn_two_left: - if (!running) { - startActivity(intent1); - } else { - startActivity(intent); - } - PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).edit().putString("Gsensor", "true") - .commit(); - finish(); - break; - case R.id.btn_two_right: - if (!running) { - startActivity(intent1); - } else { - startActivity(intent); - } - PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).edit().putString("Gsensor", "false") - .commit(); - finish(); - break; - } - } - - Runnable runnable = new Runnable() { - - @Override - public void run() { - - } - }; - - Handler handler = new Handler() { - - @Override - public void handleMessage(Message msg) { - super.handleMessage(msg); - switch (msg.what) { - case 0: - if (gb_left && gb_right && gb_down && gb_up) { - handler.removeMessages(0); - PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).edit() - .putString("Gsensor", "true").commit(); - Toast.makeText(GravitySensorActivity.this, getResources().getString(R.string.ins_gsensor_toast), - Toast.LENGTH_SHORT).show(); - - buttonView.setSuccessColor(); - - if (running) { - Intent intent = Config.getNextTestIntent(GravitySensorActivity.this,GravitySensorActivity.this.getClass());//new Intent(GravitySensorActivity.this, BatteryTestActivity.class); - intent.putExtra("running", true); - intent.putExtra("pcbatest", pcbatest); - startActivity(intent); - finish(); - }else{ - buttonView.btn_left.setClickable(true); - } - - }else{ - handler.sendEmptyMessageDelayed(0, 500); - } - - break; - - - - - - default: - break; - } - } - - }; - - @Override - public void onBackPressed() { - // super.onBackPressed(); - if (running) { - Intent intent = new Intent(this, TestMainList.class); - startActivity(intent); - finish(); - } else { - finish(); - } - } - -} +/** + * Generated by smali2java 1.0.0.558 + * Copyright (C) 2013 Hensence.com + */ + +package mobile.miki; + +import android.content.Context; +import android.content.Intent; +import android.hardware.Sensor; +import android.hardware.SensorEvent; +import android.hardware.SensorEventListener; +import android.hardware.SensorManager; +import android.os.Bundle; +import android.os.Handler; +import android.os.Message; +import android.preference.PreferenceManager; +import android.util.Log; +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; +import android.widget.Toast; + +import mobile.miki.mainui.ButtonViewTwo; +import mobile.miki.mainui.TestMainActivity; +import mobile.miki.mainui.TestMainList; +import mobile.miki.util.Config; + +public class GravitySensorActivity extends BaseActivity + implements SensorEventListener, android.view.View.OnClickListener { + private SensorManager sensorManager; + boolean gb_up = false; + boolean gb_left = false; + boolean gb_right = false; + boolean gb_down = false; + ImageView gs_up; + ImageView gs_left; + ImageView gs_right; + ImageView gs_down; + String s1; + TextView t1; + private ButtonViewTwo buttonView; + boolean running; + boolean pcbatest; + TextView xyzValue; + + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + MyApplication.getInstance().addActivity(this); + s1 = getString(R.string.ins_gsensor_toast); + setContentView(R.layout.gravity_sensor_layout); + Intent intent = getIntent(); + running = false; + pcbatest = false; + if (intent != null) { + running = intent.getBooleanExtra("running", false); + pcbatest = intent.getBooleanExtra("pcbatest",false); + } + buttonView = (ButtonViewTwo) findViewById(R.id.btn_set); + buttonView.btn_left.setOnClickListener(this); + buttonView.btn_right.setOnClickListener(this); + + //pcba测试的话，可以直接看数值人工测试是否成功。 + if (pcbatest) { + buttonView.btn_left.setClickable(true); + buttonView.setSuccessColor(); + }else{ + buttonView.btn_left.setClickable(false); + } + gs_up = (ImageView) findViewById(R.id.img_gsu); + + gs_left = (ImageView) findViewById(R.id.img_gsl); + + gs_right = (ImageView) findViewById(R.id.img_gsr); + + gs_down = (ImageView) findViewById(R.id.img_gsd); + t1 = (TextView) findViewById(R.id.ins); + xyzValue = (TextView) findViewById(R.id.xyz_value); + sensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE); + sensorManager.registerListener(this, sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER), 0x0); + handler.sendEmptyMessageDelayed(0, 500); + } + + public void onAccuracyChanged(Sensor sensor, int accuracy) { + } + + public void onSensorChanged(SensorEvent event) { + Log.i("dxc", "onSensorChanged x:" + event.values[0x0] + " y:" + event.values[0x1] + " z:" + event.values[0x2]); + xyzValue.setText("x:" + String .format("%.2f",event.values[0x0]) + " ,y:" + String .format("%.2f",event.values[0x1]) + " ,z:" + String .format("%.2f",event.values[0x2])); + ((TextView) findViewById(R.id.tvGraX)).setText(String.valueOf(event.values[0x0])); + ((TextView) findViewById(R.id.tvGraY)).setText(String.valueOf(event.values[0x1])); + ((TextView) findViewById(R.id.tvGraZ)).setText(String.valueOf(event.values[0x2])); + if (event.values[0x0] > 24.0 && !gb_left) { + gs_left.setImageResource(R.drawable.gs_2_l); + gb_left = true; + } else if (event.values[0x0] < -24.0 && !gb_right) { + gs_right.setImageResource(R.drawable.gs_2_r); + gb_right = true; + } else if (event.values[0x1] > 25.0 && !gb_down) { + gs_down.setImageResource(R.drawable.gs_2_d); + gb_down = true; + } else if (event.values[0x1] < -23.0 && !gb_up) { + gs_up.setImageResource(R.drawable.gs_2_u); + gb_up = true; + } + } + + protected void onDestroy() { + sensorManager.unregisterListener(this, sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER)); + sensorManager = null; + super.onDestroy(); + } + + + @Override + public void onClick(View arg0) { + Intent intent = Config.getNextTestIntent(this,this.getClass());//new Intent(this, BatteryTestActivity.class); + intent.putExtra("running", true); + intent.putExtra("pcbatest",pcbatest); + Intent intent1 = new Intent(this, TestMainActivity.class); + // TestResult testResult = (TestResult) getApplicationContext(); + switch (arg0.getId()) { + + case R.id.btn_two_left: + if (!running) { + startActivity(intent1); + } else { + startActivity(intent); + } + PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).edit().putString("Gsensor", "true") + .commit(); + finish(); + break; + case R.id.btn_two_right: + if (!running) { + startActivity(intent1); + } else { + startActivity(intent); + } + PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).edit().putString("Gsensor", "false") + .commit(); + finish(); + break; + } + } + + Runnable runnable = new Runnable() { + + @Override + public void run() { + + } + }; + + Handler handler = new Handler() { + + @Override + public void handleMessage(Message msg) { + super.handleMessage(msg); + switch (msg.what) { + case 0: + if (gb_left && gb_right && gb_down && gb_up) { + handler.removeMessages(0); + PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).edit() + .putString("Gsensor", "true").commit(); + Toast.makeText(GravitySensorActivity.this, getResources().getString(R.string.ins_gsensor_toast), + Toast.LENGTH_SHORT).show(); + + buttonView.setSuccessColor(); + + if (running) { + Intent intent = Config.getNextTestIntent(GravitySensorActivity.this,GravitySensorActivity.this.getClass());//new Intent(GravitySensorActivity.this, BatteryTestActivity.class); + intent.putExtra("running", true); + intent.putExtra("pcbatest", pcbatest); + startActivity(intent); + finish(); + }else{ + buttonView.btn_left.setClickable(true); + } + + }else{ + handler.sendEmptyMessageDelayed(0, 500); + } + + break; + + + + + + default: + break; + } + } + + }; + + @Override + public void onBackPressed() { + // super.onBackPressed(); + if (running) { + Intent intent = new Intent(this, TestMainList.class); + startActivity(intent); + finish(); + } else { + finish(); + } + } + +}