Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Applications Sample Camera
提交
e624cca1
A
Applications Sample Camera
项目概览
OpenHarmony
/
Applications Sample Camera
大约 1 年 前同步成功
通知
5
Star
25
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
Applications Sample Camera
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e624cca1
编写于
5月 06, 2021
作者:
O
openharmony_ci
提交者:
Gitee
5月 06, 2021
浏览文件
操作
浏览文件
下载
差异文件
!18 启动恢复子系统--系统属性API整改
Merge pull request !18 from lanxueyuan/lanxueyuan-change-param-api
上级
e49d7265
eb143374
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
5 addition
and
10 deletion
+5
-10
setting/setting/src/main/cpp/main_ability_slice.cpp
setting/setting/src/main/cpp/main_ability_slice.cpp
+2
-6
setting/setting/src/main/cpp/setting_about_ability_slice.cpp
setting/setting/src/main/cpp/setting_about_ability_slice.cpp
+2
-3
setting/setting/src/main/cpp/setting_about_ability_slice.h
setting/setting/src/main/cpp/setting_about_ability_slice.h
+1
-1
未找到文件。
setting/setting/src/main/cpp/main_ability_slice.cpp
浏览文件 @
e624cca1
...
...
@@ -271,15 +271,13 @@ void MainAbilitySlice::SetAboutButtonView(void)
buttonView
->
Add
(
lablelFontAbout
);
char
buff
[
62
];
char
*
gDV
=
GetDisplayVersion
();
c
onst
c
har
*
gDV
=
GetDisplayVersion
();
int
err
=
sprintf_s
(
buff
,
sizeof
(
buff
),
"系统版本: %s"
,
gDV
);
if
(
err
<
0
)
{
printf
(
"[ERROR]sprintf_s failed, err = %d
\n
"
,
err
);
free
(
gDV
);
gDV
=
nullptr
;
return
;
}
free
(
gDV
);
setAboutTest
(
buttonView
,
ABOUT_BUTTON_TEXT_SYSTEM_X
,
ABOUT_BUTTON_TEXT_SYSTEM_Y
,
buff
);
err
=
memset_s
(
buff
,
sizeof
(
buff
),
0
,
sizeof
(
buff
));
...
...
@@ -287,15 +285,13 @@ void MainAbilitySlice::SetAboutButtonView(void)
printf
(
"[ERROR]memset_s failed, err = %d
\n
"
,
err
);
return
;
}
c
har
*
gPT
=
GetProduct
Type
();
c
onst
char
*
gPT
=
GetDevice
Type
();
err
=
sprintf_s
(
buff
,
sizeof
(
buff
),
"设备名称: %s"
,
gPT
);
if
(
err
<
0
)
{
printf
(
"[ERROR]sprintf_s failed, err = %d
\n
"
,
err
);
free
(
gPT
);
gPT
=
nullptr
;
return
;
}
free
(
gPT
);
setAboutTest
(
buttonView
,
ABOUT_BUTTON_TEXT_DEVICE_X
,
ABOUT_BUTTON_TEXT_DEVICE_Y
,
buff
);
UIImageView
*
imageView
=
new
UIImageView
();
...
...
setting/setting/src/main/cpp/setting_about_ability_slice.cpp
浏览文件 @
e624cca1
...
...
@@ -36,7 +36,6 @@ SettingAboutAbilitySlice::~SettingAboutAbilitySlice()
}
for
(
int
count
=
0
;
count
<
SCROLL_ITEM_NUM
;
count
++
)
{
if
(
!
itemInfo_
[
count
][
1
])
{
free
(
itemInfo_
[
count
][
1
]);
itemInfo_
[
count
][
1
]
=
nullptr
;
}
}
...
...
@@ -54,7 +53,7 @@ void SettingAboutAbilitySlice::SetButtonListener()
void
SettingAboutAbilitySlice
::
SetItemInfo
()
{
itemInfo_
[
0
][
0
]
=
(
char
*
)
"设备名称"
;
// 0
itemInfo_
[
0
][
1
]
=
Get
Product
Type
();
// 0
itemInfo_
[
0
][
1
]
=
Get
Device
Type
();
// 0
itemInfo_
[
1
][
0
]
=
(
char
*
)
"厂家信息"
;
// 1
itemInfo_
[
1
][
1
]
=
GetManufacture
();
// 1
itemInfo_
[
2
][
0
]
=
(
char
*
)
"品牌信息"
;
// 2
...
...
@@ -64,7 +63,7 @@ void SettingAboutAbilitySlice::SetItemInfo()
itemInfo_
[
4
][
0
]
=
(
char
*
)
"设备序列号"
;
// 4
itemInfo_
[
4
][
1
]
=
GetSerial
();
// 4
itemInfo_
[
5
][
0
]
=
(
char
*
)
"操作系统名"
;
// 5
itemInfo_
[
5
][
1
]
=
GetO
s
Name
();
// 5
itemInfo_
[
5
][
1
]
=
GetO
SFull
Name
();
// 5
itemInfo_
[
6
][
0
]
=
(
char
*
)
"软件版本号"
;
// 6
itemInfo_
[
6
][
1
]
=
GetDisplayVersion
();
// 6
itemInfo_
[
7
][
0
]
=
(
char
*
)
"BootLoader版本号"
;
// 7
...
...
setting/setting/src/main/cpp/setting_about_ability_slice.h
浏览文件 @
e624cca1
...
...
@@ -58,7 +58,7 @@ private:
RootView
*
rootView_
;
EventListener
*
buttonBackListener_
;
constexpr
static
int
SCROLL_ITEM_NUM
=
9
;
char
*
itemInfo_
[
SCROLL_ITEM_NUM
][
2
];
c
onst
c
har
*
itemInfo_
[
SCROLL_ITEM_NUM
][
2
];
constexpr
static
int
ITEM_X
=
0
;
constexpr
static
int
ITEM_INFO_X
=
465
;
constexpr
static
int
ITEM_INFO_Y
=
36
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录