From: SnickerSun Date: Fri, 23 Jul 2021 16:55:13 +0000 (+0800) Subject: release V119 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;ds=sidebyside;p=factoryMode.git release V119 提交落下的 陀螺仪测试 UI文件 添加W560支持 --- diff --git a/app/release/FactoryMode_V119_202107240052_release.apk b/app/release/FactoryMode_V119_202107240052_release.apk new file mode 100644 index 0000000..055a4d0 Binary files /dev/null and b/app/release/FactoryMode_V119_202107240052_release.apk differ diff --git a/app/release/output.json b/app/release/output.json index 8df2398..e64b6da 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":118,"versionName":"202107192107","enabled":true,"outputFile":"FactoryMode_V118_202107192107_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V118_202107192107_release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":119,"versionName":"202107240052","enabled":true,"outputFile":"FactoryMode_V119_202107240052_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V119_202107240052_release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/java/mobile/miki/GyroScope.java b/app/src/main/java/mobile/miki/GyroScope.java new file mode 100644 index 0000000..fc704ac --- /dev/null +++ b/app/src/main/java/mobile/miki/GyroScope.java @@ -0,0 +1,172 @@ +package mobile.miki; + +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.TextView; + +import com.ic.jni.ICJniUtils; + +import java.util.Timer; +import java.util.TimerTask; + +import mobile.miki.mainui.ButtonViewTwo; +import mobile.miki.mainui.TestMainActivity; +import mobile.miki.util.Config; +import mobile.miki.util.FTUtils; + +public class GyroScope extends BaseActivity implements View.OnClickListener, SensorEventListener { + + private ButtonViewTwo buttonView; + boolean running; + public static final int TYPE_HEART_RATE = 21; + Timer mTimer=null; + + private TextView tv_x; + private TextView tv_y; + private TextView tv_z; + + private SensorManager mSensorManager=null; + private Sensor mGyroScope=null; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.gyroscope_layout); + initView(); + + Intent intent = getIntent(); + running = false; + if (intent != null) { + running = intent.getBooleanExtra("running", false); + } + + + mSensorManager = (SensorManager) getSystemService(SENSOR_SERVICE); + mGyroScope = mSensorManager.getDefaultSensor(Sensor.TYPE_GYROSCOPE); + boolean ret = mSensorManager.registerListener(this, mGyroScope, SensorManager.SENSOR_DELAY_NORMAL); + Log.i("dxc", " GyroScope opened ret :: " + ret); + + + } + + Handler mhandler=new Handler(new Handler.Callback() { + @Override + public boolean handleMessage(Message message) { + + switch(message.what) + { + + case 1: { + Bundle bdl = message.getData(); + String x = bdl.getString("X"); + String y = bdl.getString("Y"); + String z = bdl.getString("Z"); + if (!x.trim().isEmpty() && !y.trim().isEmpty()&& !z.trim().isEmpty()) { + tv_x.setText(" " + x); + tv_y.setText(" " + y); + tv_z.setText(" " + z); + } else { + tv_x.setText(" " + GyroScope.this.getResources().getString(R.string.no_gyroscope)); + tv_y.setText(""); + tv_z.setText(""); + } + } + break; + + } + + return false; + } + }); + @Override + protected void onDestroy() { + super.onDestroy(); + + mSensorManager.unregisterListener(this); + Log.i("dxc", "GyroScope closed"); + + } + + @Override + protected void onPause() { + super.onPause(); + Log.i( "dxc","GyroScope onPause"); + + } + + private void initView() { + buttonView = (ButtonViewTwo) findViewById(R.id.btn_set); + buttonView.btn_left.setOnClickListener(this); + buttonView.btn_right.setOnClickListener(this); + buttonView.setSuccessColor(); + buttonView.btn_left.setClickable(true); + + tv_x=(TextView)findViewById(R.id.tv_gyro_xvalue); + tv_y=(TextView)findViewById(R.id.tv_gyro_yvalue); + tv_z=(TextView)findViewById(R.id.tv_gyro_zvalue); + + } + + @Override + public void onClick(View view) { + Intent intent = Config.getNextTestIntent(this,this.getClass());//new Intent(this, SimDetectActivity.class); + intent.putExtra("running", true); + Intent intent1 = new Intent(this, TestMainActivity.class); + // TestResult testResult = (TestResult) getApplicationContext(); + switch (view.getId()) { + + case R.id.btn_two_left: + if (!running) { + startActivity(intent1); + } else { + startActivity(intent); + } + PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).edit().putString("gyroscope", "true").commit(); + finish(); + break; + case R.id.btn_two_right: + if (!running) { + startActivity(intent1); + } else { + startActivity(intent); + } + PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).edit().putString("gyroscope", "false").commit(); + finish(); + break; + } + } + + @Override + public void onSensorChanged(SensorEvent sensorEvent) { + float values[]=sensorEvent.values; + int length = values.length; + Log.i( "dxc","onSensorChanged() is called "+length + +" X = "+values[0] + +", Y = "+values[1] + +", Z = "+values[2] + ); + + Message msg=new Message(); + Bundle bdl=new Bundle(); + msg.what=1; + bdl.putString("X", String.format("%.5f",values[0])); + bdl.putString("Y",String.format("%.5f",values[1])); + bdl.putString("Z",String.format("%.5f",values[2])); + msg.setData(bdl); + mhandler.sendMessage(msg); + + } + + @Override + public void onAccuracyChanged(Sensor sensor, int i) { + Log.i("dxc","onAccuracyChanged() is called "+sensor.getName()+" accuracy="+i); + } +} diff --git a/app/src/main/java/mobile/miki/util/Config.java b/app/src/main/java/mobile/miki/util/Config.java index aeb13ad..1b200a1 100644 --- a/app/src/main/java/mobile/miki/util/Config.java +++ b/app/src/main/java/mobile/miki/util/Config.java @@ -276,6 +276,26 @@ public class Config { testResultList.add("bt"); testResultList.add("vibrator"); testResultList.add("Ultraviolet"); + } else if (FTUtils.isW560()) { + +// list.add(context.getString(R.string.bt)); +// testResultList.add("bt"); + +// list.add(context.getString(R.string.dsp)); +// testResultList.add("dsp"); + + list.add(context.getString(R.string.test_keypad)); + testResultList.add("keys"); + + list.add(context.getString(R.string.shakeTest)); + testResultList.add("vibrator"); + + list.add(context.getString(R.string.heartrate)); + testResultList.add("heartrate"); + + list.add(context.getString(R.string.temperature)); + testResultList.add("temperature"); + } else if (FTUtils.isV20()) { // s06 添加dsp测试 list.add(context.getString(R.string.test_keypad)); diff --git a/app/src/main/java/mobile/miki/util/FTUtils.java b/app/src/main/java/mobile/miki/util/FTUtils.java index c3ef4c0..4f0cf67 100644 --- a/app/src/main/java/mobile/miki/util/FTUtils.java +++ b/app/src/main/java/mobile/miki/util/FTUtils.java @@ -251,7 +251,13 @@ public class FTUtils { } return false; } + public static boolean isW560(){ + if(SystemProperties.get("persist.sys.id_num","").equalsIgnoreCase("W560")) { + return true; + } + return false; + } public static boolean isGT09(){ if(SystemProperties.get("persist.sys.id_num","").equalsIgnoreCase("GT09") || SystemProperties.get("persist.sys.customname","").equalsIgnoreCase("GT09") diff --git a/app/src/main/res/layout/gyroscope_layout.xml b/app/src/main/res/layout/gyroscope_layout.xml new file mode 100644 index 0000000..13a1cb0 --- /dev/null +++ b/app/src/main/res/layout/gyroscope_layout.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/version_code.properties b/app/version_code.properties index 89ba990..7d88ae7 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Mon Jul 19 21:07:38 CST 2021 -VERSION_CODE=118 +#Sat Jul 24 00:52:51 CST 2021 +VERSION_CODE=119