Skip to content

Commit 792bde6

Browse files
re2zerore2zero
committed
chore: [vnc]Integrate the vnc module
Integrate the vnc module which from droidVNC-NG. Log: Integrate the vnc module.
1 parent 07723b2 commit 792bde6

File tree

706 files changed

+246494
-58
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

706 files changed

+246494
-58
lines changed

‎android/app/build.gradle

+11-3
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ android {
6868
])
6969
// 调试模式下只保留一种架构的 so 库，提升打包速度
7070
ndk {
71-
abiFilters 'armeabi-v7a'
71+
abiFilters 'arm64-v8a'
7272
}
7373
}
7474

@@ -145,8 +145,16 @@ dependencies {
145145
// 友盟封装
146146
implementation project(':library:umeng')
147147

148+
implementation project(':library:droidvnc-ng')
149+
150+
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1"
151+
152+
// AndroidX 版本：https://mvnrepository.com/artifact/androidx.core/core-ktx
153+
implementation "androidx.core:core:1.7.0"
154+
implementation 'androidx.preference:preference:1.2.1'
155+
148156
// 权限请求框架：https://github.com/getActivity/XXPermissions
149-
implementation 'com.github.getActivity:XXPermissions:12.3'
157+
implementation 'com.github.getActivity:XXPermissions:16.0'
150158

151159
// 标题栏框架：https://github.com/getActivity/TitleBar
152160
implementation 'com.github.getActivity:TitleBar:9.2'
@@ -161,7 +169,7 @@ dependencies {
161169
implementation 'com.squareup.okhttp3:okhttp:3.12.13'
162170

163171
// Json 解析框架：https://github.com/google/gson
164-
implementation 'com.google.code.gson:gson:2.8.8'
172+
implementation 'com.google.code.gson:gson:2.10.1'
165173
// Gson 解析容错：https://github.com/getActivity/GsonFactory
166174
implementation 'com.github.getActivity:GsonFactory:5.2'
167175

‎android/app/src/main/AndroidManifest.xml

+22-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<!-- 外部存储 -->
1313
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
14-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage" />
14+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="32" tools:ignore="ScopedStorage"/>
1515

1616
<!-- 拍照权限 -->
1717
<uses-permission android:name="android.permission.CAMERA" />
@@ -23,6 +23,15 @@
2323
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
2424
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
2525

26+
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
27+
28+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
29+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION"/>
30+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE"/>
31+
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
32+
<uses-permission android:name="android.permission.WAKE_LOCK"/>
33+
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
34+
2635
<!-- Application 节点详解：https://developer.android.google.cn/guide/topics/manifest/application-element -->
2736
<!-- Activity 节点详解：https://developer.android.google.cn/guide/topics/manifest/activity-element -->
2837
<application
@@ -61,6 +70,7 @@
6170
<!-- 闪屏页 -->
6271
<activity
6372
android:name=".ui.activity.SplashActivity"
73+
android:exported="true"
6474
android:launchMode="singleTop"
6575
android:screenOrientation="portrait"
6676
android:theme="@style/SplashTheme">
@@ -81,6 +91,17 @@
8191
android:launchMode="singleTop"
8292
android:screenOrientation="portrait" />
8393

94+
<activity android:name=".ui.activity.MainActivity"
95+
android:label="@string/main_activity_title"
96+
android:launchMode="singleTask"
97+
android:exported="true">
98+
<!-- <intent-filter>-->
99+
<!-- <action android:name="android.intent.action.MAIN" />-->
100+
<!-- <category android:name="android.intent.category.LAUNCHER" />-->
101+
<!-- <category android:name="android.intent.category.LEANBACK_LAUNCHER" />-->
102+
<!-- </intent-filter>-->
103+
</activity>
104+
84105
<!-- 首页 -->
85106
<activity
86107
android:name=".ui.activity.HomeActivity"

‎android/app/src/main/java/com/deepin/assistant/ui/activity/DialogActivity.kt

+45-45
Original file line numberDiff line numberDiff line change
@@ -292,51 +292,51 @@ class DialogActivity : AppActivity() {
292292
.show()
293293

294294
}
295-
R.id.btn_dialog_custom -> {
296-
297-
// 自定义对话框
298-
BaseDialog.Builder<BaseDialog.Builder<*>>(this)
299-
.setContentView(R.layout.custom_dialog)
300-
.setAnimStyle(AnimAction.ANIM_SCALE) //.setText(id, "我是预设置的文本")
301-
.setOnClickListener(R.id.btn_dialog_custom_ok, object : BaseDialog.OnClickListener<Button> {
302-
override fun onClick(dialog: BaseDialog?, view: Button) {
303-
dialog?.dismiss()
304-
}
305-
})
306-
.setOnCreateListener(object : BaseDialog.OnCreateListener {
307-
308-
override fun onCreate(dialog: BaseDialog?) {
309-
toast("Dialog 创建了")
310-
}
311-
})
312-
.addOnShowListener(object : BaseDialog.OnShowListener {
313-
314-
override fun onShow(dialog: BaseDialog?) {
315-
toast("Dialog 显示了")
316-
}
317-
})
318-
.addOnCancelListener(object : BaseDialog.OnCancelListener {
319-
320-
override fun onCancel(dialog: BaseDialog?) {
321-
toast("Dialog 取消了")
322-
}
323-
})
324-
.addOnDismissListener(object : BaseDialog.OnDismissListener {
325-
326-
override fun onDismiss(dialog: BaseDialog?) {
327-
toast("Dialog 销毁了")
328-
}
329-
})
330-
.setOnKeyListener(object : BaseDialog.OnKeyListener {
331-
332-
override fun onKey(dialog: BaseDialog?, event: KeyEvent?): Boolean {
333-
toast("按键代码：" + event?.keyCode)
334-
return false
335-
}
336-
})
337-
.show()
338-
339-
}
295+
// R.id.btn_dialog_custom -> {
296+
//
297+
// // 自定义对话框
298+
// BaseDialog.Builder<BaseDialog.Builder<*>>(this)
299+
// .setContentView(R.layout.custom_dialog)
300+
// .setAnimStyle(AnimAction.ANIM_SCALE) //.setText(id, "我是预设置的文本")
301+
// .setOnClickListener(R.id.btn_dialog_custom_ok, object : BaseDialog.OnClickListener<Button> {
302+
// override fun onClick(dialog: BaseDialog?, view: Button) {
303+
// dialog?.dismiss()
304+
// }
305+
// })
306+
// .setOnCreateListener(object : BaseDialog.OnCreateListener {
307+
//
308+
// override fun onCreate(dialog: BaseDialog?) {
309+
// toast("Dialog 创建了")
310+
// }
311+
// })
312+
// .addOnShowListener(object : BaseDialog.OnShowListener {
313+
//
314+
// override fun onShow(dialog: BaseDialog?) {
315+
// toast("Dialog 显示了")
316+
// }
317+
// })
318+
// .addOnCancelListener(object : BaseDialog.OnCancelListener {
319+
//
320+
// override fun onCancel(dialog: BaseDialog?) {
321+
// toast("Dialog 取消了")
322+
// }
323+
// })
324+
// .addOnDismissListener(object : BaseDialog.OnDismissListener {
325+
//
326+
// override fun onDismiss(dialog: BaseDialog?) {
327+
// toast("Dialog 销毁了")
328+
// }
329+
// })
330+
// .setOnKeyListener(object : BaseDialog.OnKeyListener {
331+
//
332+
// override fun onKey(dialog: BaseDialog?, event: KeyEvent?): Boolean {
333+
// toast("按键代码：" + event?.keyCode)
334+
// return false
335+
// }
336+
// })
337+
// .show()
338+
//
339+
// }
340340
R.id.btn_dialog_multi -> {
341341

342342
val dialog1: BaseDialog = MessageDialog.Builder(this)

0 commit comments

Comments
 (0)