Commit 8bc65c9d authored by hywang's avatar hywang

1.修改设置和同步的icon

parent 174286c0
......@@ -9,8 +9,8 @@ android {
applicationId "com.phlx.anchorcollect_p"
minSdkVersion 21
targetSdkVersion 29
versionCode 3
versionName "1.0.2"
versionCode 4
versionName "1.0.3"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
......
......@@ -27,6 +27,7 @@ import com.phlx.anchorcollect_p.ui.fragment.ImmunRecordFragment;
import com.phlx.anchorcollect_p.ui.fragment.MedicalRecordFragment;
import com.phlx.anchorcollect_p.ui.fragment.PerformanceFragment;
import com.phlx.anchorcollect_p.ui.fragment.WeightManFragment;
import com.uhf.structures.DynamicQParams;
import com.uhf.structures.InventoryParams;
import me.goldze.mvvmhabit.utils.ToastUtils;
......@@ -168,6 +169,38 @@ public class MainActivity extends BaseActivity<ActivityMainBinding, MainVM> {
inventoryParams.inventoryArea = 2;
inventoryParams.len = 6;
App.getInstance().getLinkage().Radio_SetInventoryParams(inventoryParams);
setAlgorithm();
}
/**
* 获取算法
*/
private void setAlgorithm() {
DynamicQParams dynamicQParams = new DynamicQParams();
int dynamic_state =
App.getInstance().getLinkage().Radio_GetSingulationAlgorithmDyParameters(dynamicQParams);
if (dynamic_state == 0) {
dynamicQParams.thresholdMultiplier = 4;
int dynamicResult =
App.getInstance().getLinkage().Radio_SetSingulationAlgorithmDyParameters(dynamicQParams);
if (dynamicResult == 0) {
// ToastUtils.showShort("设置动态算法成功");
// int saveStatue = App.getInstance().getLinkage().saveR2000Setting();
// if (saveStatue == 0) {
//// ToastUtils.showShort("参数保存成功");
// } else {
// ToastUtils.showShort("参数保存失败");
// }
} else {
ToastUtils.showShort("设置动态算法失败");
}
// ToastUtils.showShort("获取动态算法成功");
}else {
ToastUtils.showShort("获取动态算法失败");
}
}
@Override
......
......@@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:padding="5dp"
android:src="@mipmap/ic_set"
android:src="@mipmap/icon_sync"
binding:layout_constraintRight_toLeftOf="@+id/iv_setting"
binding:layout_constraintTop_toTopOf="parent"
binding:onClickCommand="@{viewModel.onSyncClick}" />
......@@ -68,7 +68,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:text="tag"
android:text="可视耳标号"
android:textColor="@color/colorPrimary"
android:textSize="@dimen/sp_16" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment