Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in
Toggle navigation
A
AnchorCollect_p
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hywang
AnchorCollect_p
Commits
8bc65c9d
Commit
8bc65c9d
authored
Oct 13, 2022
by
hywang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.修改设置和同步的icon
parent
174286c0
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
37 additions
and
4 deletions
+37
-4
build.gradle
app/build.gradle
+2
-2
MainActivity.java
...n/java/com/phlx/anchorcollect_p/ui/main/MainActivity.java
+33
-0
fragment_basics_collect.xml
app/src/main/res/layout/fragment_basics_collect.xml
+2
-2
ic_set.png
app/src/main/res/mipmap-xhdpi/ic_set.png
+0
-0
icon_sync.png
app/src/main/res/mipmap-xhdpi/icon_sync.png
+0
-0
No files found.
app/build.gradle
View file @
8bc65c9d
...
@@ -9,8 +9,8 @@ android {
...
@@ -9,8 +9,8 @@ android {
applicationId
"com.phlx.anchorcollect_p"
applicationId
"com.phlx.anchorcollect_p"
minSdkVersion
21
minSdkVersion
21
targetSdkVersion
29
targetSdkVersion
29
versionCode
3
versionCode
4
versionName
"1.0.
2
"
versionName
"1.0.
3
"
testInstrumentationRunner
"androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"androidx.test.runner.AndroidJUnitRunner"
...
...
app/src/main/java/com/phlx/anchorcollect_p/ui/main/MainActivity.java
View file @
8bc65c9d
...
@@ -27,6 +27,7 @@ import com.phlx.anchorcollect_p.ui.fragment.ImmunRecordFragment;
...
@@ -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.MedicalRecordFragment
;
import
com.phlx.anchorcollect_p.ui.fragment.PerformanceFragment
;
import
com.phlx.anchorcollect_p.ui.fragment.PerformanceFragment
;
import
com.phlx.anchorcollect_p.ui.fragment.WeightManFragment
;
import
com.phlx.anchorcollect_p.ui.fragment.WeightManFragment
;
import
com.uhf.structures.DynamicQParams
;
import
com.uhf.structures.InventoryParams
;
import
com.uhf.structures.InventoryParams
;
import
me.goldze.mvvmhabit.utils.ToastUtils
;
import
me.goldze.mvvmhabit.utils.ToastUtils
;
...
@@ -168,6 +169,38 @@ public class MainActivity extends BaseActivity<ActivityMainBinding, MainVM> {
...
@@ -168,6 +169,38 @@ public class MainActivity extends BaseActivity<ActivityMainBinding, MainVM> {
inventoryParams
.
inventoryArea
=
2
;
inventoryParams
.
inventoryArea
=
2
;
inventoryParams
.
len
=
6
;
inventoryParams
.
len
=
6
;
App
.
getInstance
().
getLinkage
().
Radio_SetInventoryParams
(
inventoryParams
);
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
@Override
...
...
app/src/main/res/layout/fragment_basics_collect.xml
View file @
8bc65c9d
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_margin=
"10dp"
android:layout_margin=
"10dp"
android:padding=
"5dp"
android:padding=
"5dp"
android:src=
"@mipmap/ic
_set
"
android:src=
"@mipmap/ic
on_sync
"
binding:layout_constraintRight_toLeftOf=
"@+id/iv_setting"
binding:layout_constraintRight_toLeftOf=
"@+id/iv_setting"
binding:layout_constraintTop_toTopOf=
"parent"
binding:layout_constraintTop_toTopOf=
"parent"
binding:onClickCommand=
"@{viewModel.onSyncClick}"
/>
binding:onClickCommand=
"@{viewModel.onSyncClick}"
/>
...
@@ -68,7 +68,7 @@
...
@@ -68,7 +68,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"10dp"
android:layout_marginLeft=
"10dp"
android:layout_marginTop=
"10dp"
android:layout_marginTop=
"10dp"
android:text=
"
tag
"
android:text=
"
可视耳标号
"
android:textColor=
"@color/colorPrimary"
android:textColor=
"@color/colorPrimary"
android:textSize=
"@dimen/sp_16"
/>
android:textSize=
"@dimen/sp_16"
/>
...
...
app/src/main/res/mipmap-xhdpi/ic_set.png
View replaced file @
174286c0
View file @
8bc65c9d
1.57 KB
|
W:
|
H:
1.77 KB
|
W:
|
H:
2-up
Swipe
Onion skin
app/src/main/res/mipmap-xhdpi/icon_sync.png
0 → 100644
View file @
8bc65c9d
1.18 KB
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment