Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Applications Sample Camera
提交
3e27d768
A
Applications Sample Camera
项目概览
OpenHarmony
/
Applications Sample Camera
9 个月 前同步成功
通知
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
3e27d768
编写于
11月 01, 2022
作者:
O
openharmony_ci
提交者:
Gitee
11月 01, 2022
浏览文件
操作
浏览文件
下载
差异文件
!127 修复告警
Merge pull request !127 from leihonglin/master
上级
0e2b32d8
e4e761f7
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
9 addition
and
21 deletion
+9
-21
launcher/launcher/src/main/cpp/app_manage.h
launcher/launcher/src/main/cpp/app_manage.h
+1
-1
launcher/launcher/src/main/cpp/event_listener.h
launcher/launcher/src/main/cpp/event_listener.h
+1
-4
launcher/launcher/src/main/cpp/long_press_view.cpp
launcher/launcher/src/main/cpp/long_press_view.cpp
+0
-2
launcher/launcher/src/main/cpp/swipe_view.h
launcher/launcher/src/main/cpp/swipe_view.h
+1
-1
launcher/launcher/src/main/cpp/time_weather_view.h
launcher/launcher/src/main/cpp/time_weather_view.h
+1
-1
launcher/launcher/src/main/cpp/view_group_page.h
launcher/launcher/src/main/cpp/view_group_page.h
+2
-2
setting/setting/src/main/cpp/app_ability_slice.cpp
setting/setting/src/main/cpp/app_ability_slice.cpp
+0
-3
setting/setting/src/main/cpp/app_info_ability_slice.h
setting/setting/src/main/cpp/app_info_ability_slice.h
+1
-1
setting/setting/src/main/cpp/event_listener.h
setting/setting/src/main/cpp/event_listener.h
+1
-4
setting/setting/src/main/cpp/wpa_work.c
setting/setting/src/main/cpp/wpa_work.c
+1
-2
未找到文件。
launcher/launcher/src/main/cpp/app_manage.h
浏览文件 @
3e27d768
...
@@ -38,7 +38,7 @@ public:
...
@@ -38,7 +38,7 @@ public:
bool
InstallApp
(
AppInfo
*
app
);
bool
InstallApp
(
AppInfo
*
app
);
bool
UnInstallApp
(
AppInfo
*
app
);
bool
UnInstallApp
(
AppInfo
*
app
);
bool
StartApp
(
AppInfo
*
app
);
bool
StartApp
(
AppInfo
*
app
);
static
void
SetViewGroup
(
funcClick
click
,
funcLongPress
press
,
ViewGroupPage
*
arr
Page
[
MAX_VIEWGROUP
],
int
size
);
static
void
SetViewGroup
(
funcClick
click
,
funcLongPress
press
,
ViewGroupPage
*
view
Page
[
MAX_VIEWGROUP
],
int
size
);
private:
private:
static
void
MyBundleStateCallback
(
const
uint8_t
installType
,
const
uint8_t
resultCode
,
const
void
*
resultMessage
,
static
void
MyBundleStateCallback
(
const
uint8_t
installType
,
const
uint8_t
resultCode
,
const
void
*
resultMessage
,
...
...
launcher/launcher/src/main/cpp/event_listener.h
浏览文件 @
3e27d768
...
@@ -29,10 +29,7 @@ public:
...
@@ -29,10 +29,7 @@ public:
~
EventListener
()
override
=
default
;
~
EventListener
()
override
=
default
;
EventListener
(
OnEventFunc
onClick
,
OnEventFunc
onLongPress
)
EventListener
(
OnEventFunc
onClick
,
OnEventFunc
onLongPress
)
{
:
onClick_
(
std
::
move
(
onClick
)),
onLongPress_
(
std
::
move
(
onLongPress
))
{}
onClick_
=
std
::
move
(
onClick
);
onLongPress_
=
std
::
move
(
onLongPress
);
}
bool
OnClick
(
UIView
&
view
,
const
ClickEvent
&
event
)
override
bool
OnClick
(
UIView
&
view
,
const
ClickEvent
&
event
)
override
{
{
...
...
launcher/launcher/src/main/cpp/long_press_view.cpp
浏览文件 @
3e27d768
...
@@ -92,8 +92,6 @@ bool LongPressView::OnClick(UIView& view, const ClickEvent& event)
...
@@ -92,8 +92,6 @@ bool LongPressView::OnClick(UIView& view, const ClickEvent& event)
if
(
currentView
==
nullptr
)
{
if
(
currentView
==
nullptr
)
{
return
false
;
return
false
;
}
}
UILabelButton
*
lbutt
=
nullptr
;
lbutt
=
static_cast
<
UILabelButton
*>
(
currentView
);
RemoveLview
();
RemoveLview
();
if
(
currentView
==
buttUninstall_
)
{
if
(
currentView
==
buttUninstall_
)
{
uninstall_
(
app_
);
uninstall_
(
app_
);
...
...
launcher/launcher/src/main/cpp/swipe_view.h
浏览文件 @
3e27d768
...
@@ -81,10 +81,10 @@ public:
...
@@ -81,10 +81,10 @@ public:
void
InstallApp
(
AppInfo
*
app
);
void
InstallApp
(
AppInfo
*
app
);
void
Callback
()
override
void
Callback
()
override
{
{
char
tmp
[
TMP_BUF_SIZE
]
=
{
0
};
time_t
t
=
time
(
nullptr
);
time_t
t
=
time
(
nullptr
);
struct
tm
*
st
=
localtime
(
&
t
);
struct
tm
*
st
=
localtime
(
&
t
);
if
(
st
!=
nullptr
)
{
if
(
st
!=
nullptr
)
{
char
tmp
[
TMP_BUF_SIZE
]
=
{
0
};
int
ret
=
sprintf_s
(
tmp
,
sizeof
(
tmp
),
"%02d : %02d"
,
st
->
tm_hour
,
st
->
tm_min
);
int
ret
=
sprintf_s
(
tmp
,
sizeof
(
tmp
),
"%02d : %02d"
,
st
->
tm_hour
,
st
->
tm_min
);
if
(
ret
!=
LAUNCHER_PARAMERROR
)
{
if
(
ret
!=
LAUNCHER_PARAMERROR
)
{
lableTitle_
->
SetText
(
tmp
);
lableTitle_
->
SetText
(
tmp
);
...
...
launcher/launcher/src/main/cpp/time_weather_view.h
浏览文件 @
3e27d768
...
@@ -43,7 +43,7 @@ public:
...
@@ -43,7 +43,7 @@ public:
explicit
TimeWeatherView
(
UIViewGroup
*
viewGroup
);
explicit
TimeWeatherView
(
UIViewGroup
*
viewGroup
);
virtual
~
TimeWeatherView
();
virtual
~
TimeWeatherView
();
void
SetStyle
(
Style
sty
);
void
SetStyle
(
Style
sty
);
void
SetPosion
(
int16_t
width
,
int16_t
height
,
int16_t
x
,
int16_t
y
);
void
SetPosion
(
int16_t
x
,
int16_t
y
,
int16_t
height
,
int16_t
width
);
void
SetUpView
();
void
SetUpView
();
void
SetUpTimeView
();
void
SetUpTimeView
();
...
...
launcher/launcher/src/main/cpp/view_group_page.h
浏览文件 @
3e27d768
...
@@ -33,8 +33,8 @@ public:
...
@@ -33,8 +33,8 @@ public:
virtual
~
ViewGroupPage
();
virtual
~
ViewGroupPage
();
void
SetMatrix
(
int16_t
rows
,
int16_t
cols
);
void
SetMatrix
(
int16_t
rows
,
int16_t
cols
);
bool
AddApp
(
AppInfo
*
pAppInfo
);
bool
AddApp
(
AppInfo
*
pAppInfo
);
bool
RemoveApp
(
const
char
*
a
ppName
);
bool
RemoveApp
(
const
char
*
pA
ppName
);
bool
FindApp
(
AppInfo
*
pApp
Info
);
bool
FindApp
(
AppInfo
*
pApp
);
void
SetScale
(
double
scale
);
void
SetScale
(
double
scale
);
protected:
protected:
...
...
setting/setting/src/main/cpp/app_ability_slice.cpp
浏览文件 @
3e27d768
...
@@ -117,9 +117,6 @@ void AppAbilitySlice::SetAnAppInfo(const int count, BundleInfo& pBundleInfo)
...
@@ -117,9 +117,6 @@ void AppAbilitySlice::SetAnAppInfo(const int count, BundleInfo& pBundleInfo)
printf
(
"[ERROR]strcpy_s pBundleInfo.bundleName failed, err = %d
\n
"
,
err
);
printf
(
"[ERROR]strcpy_s pBundleInfo.bundleName failed, err = %d
\n
"
,
err
);
return
;
return
;
}
}
for
(
size_t
i
=
0
;
i
<
strlen
(
pBundleInfo
.
bundleName
);
i
++
)
{
buff
[
i
]
=
pBundleInfo
.
bundleName
[
i
];
}
SetAppButtonListener
(
pBundleInfo
.
bundleName
);
SetAppButtonListener
(
pBundleInfo
.
bundleName
);
itemView
->
SetOnClickListener
(
buttonAppInfoListener_
);
itemView
->
SetOnClickListener
(
buttonAppInfoListener_
);
scrollView_
->
Add
(
itemView
);
scrollView_
->
Add
(
itemView
);
...
...
setting/setting/src/main/cpp/app_info_ability_slice.h
浏览文件 @
3e27d768
...
@@ -123,7 +123,7 @@ private:
...
@@ -123,7 +123,7 @@ private:
void
PermissionInfoList
();
void
PermissionInfoList
();
void
SetAppPermissionInfo
(
int
index
,
PermissionSaved
&
permissions
);
void
SetAppPermissionInfo
(
int
index
,
PermissionSaved
&
permissions
);
char
bundleName_
[
128
];
char
bundleName_
[
128
]
=
{
0
}
;
};
};
}
// namespace OHOS
}
// namespace OHOS
...
...
setting/setting/src/main/cpp/event_listener.h
浏览文件 @
3e27d768
...
@@ -30,10 +30,7 @@ public:
...
@@ -30,10 +30,7 @@ public:
~
EventListener
()
override
=
default
;
~
EventListener
()
override
=
default
;
EventListener
(
OnEventFunc
onClick
,
OnEventFunc
onLongPress
)
EventListener
(
OnEventFunc
onClick
,
OnEventFunc
onLongPress
)
{
:
onClick_
(
std
::
move
(
onClick
)),
onLongPress_
(
std
::
move
(
onLongPress
))
{}
onClick_
=
std
::
move
(
onClick
);
onLongPress_
=
std
::
move
(
onLongPress
);
}
bool
OnClick
(
UIView
&
view
,
const
ClickEvent
&
event
)
override
bool
OnClick
(
UIView
&
view
,
const
ClickEvent
&
event
)
override
{
{
...
...
setting/setting/src/main/cpp/wpa_work.c
浏览文件 @
3e27d768
...
@@ -451,10 +451,9 @@ int InitControlInterface()
...
@@ -451,10 +451,9 @@ int InitControlInterface()
void
*
WpaScanThread
(
void
*
args
)
void
*
WpaScanThread
(
void
*
args
)
{
{
int
mySleep
=
2
;
int
mySleep
=
2
;
int
ret
=
0
;
sleep
(
mySleep
);
sleep
(
mySleep
);
if
(
g_monitorConn
==
NULL
)
{
if
(
g_monitorConn
==
NULL
)
{
ret
=
InitControlInterface
();
int
ret
=
InitControlInterface
();
printf
(
"%s:%d [INFO] InitControlInterface return %d.
\n
"
,
__FUNCTION__
,
__LINE__
,
ret
);
printf
(
"%s:%d [INFO] InitControlInterface return %d.
\n
"
,
__FUNCTION__
,
__LINE__
,
ret
);
if
(
ret
==
-
1
)
{
if
(
ret
==
-
1
)
{
return
NULL
;
return
NULL
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录