hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #613 from SoLongAndThanksForAllThePizza/flutter_desktop

Browse Source 
Fixed some unchanged names
This commit is contained in:
RustDesk 2022-05-25 21:00:26 +08:00 committed by GitHub
commit b9f515cff1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.rs
View File

@ -64,11 +64,11 @@ fn install_oboe() {
fn gen_flutter_rust_bridge() { fn gen_flutter_rust_bridge() {
// Tell Cargo that if the given file changes, to rerun this build script. // Tell Cargo that if the given file changes, to rerun this build script.
println!("cargo:rerun-if-changed=src/mobile_ffi.rs"); println!("cargo:rerun-if-changed=src/flutter_ffi.rs");
// settings for fbr_codegen // settings for fbr_codegen
let opts = lib_flutter_rust_bridge_codegen::Opts { let opts = lib_flutter_rust_bridge_codegen::Opts {
// Path of input Rust code // Path of input Rust code
rust_input: "src/mobile_ffi.rs".to_string(), rust_input: "src/flutter_ffi.rs".to_string(),
// Path of output generated Dart code // Path of output generated Dart code
dart_output: "flutter/lib/generated_bridge.dart".to_string(), dart_output: "flutter/lib/generated_bridge.dart".to_string(),
// for other options lets use default // for other options lets use default

2
src/client/file_trait.rs
View File

@ -24,7 +24,7 @@ pub trait FileManager: Interface {
#[cfg(any(target_os = "android", target_os = "ios"))] #[cfg(any(target_os = "android", target_os = "ios"))]
fn read_dir(&self,path: &str, include_hidden: bool) -> String { fn read_dir(&self,path: &str, include_hidden: bool) -> String {
use crate::mobile::make_fd_to_json; use crate::flutter::make_fd_to_json;
match fs::read_dir(&fs::get_path(path), include_hidden){ match fs::read_dir(&fs::get_path(path), include_hidden){
Ok(fd) => make_fd_to_json(fd), Ok(fd) => make_fd_to_json(fd),
Err(_)=>"".into() Err(_)=>"".into()

8
src/flutter_ffi.rs
View File

@ -1,6 +1,6 @@
use crate::client::file_trait::FileManager; use crate::client::file_trait::FileManager;
use crate::mobile::connection_manager::{self, get_clients_length, get_clients_state}; use crate::flutter::connection_manager::{self, get_clients_length, get_clients_state};
use crate::mobile::{self, make_fd_to_json, Session}; use crate::flutter::{self, make_fd_to_json, Session};
use flutter_rust_bridge::{StreamSink, ZeroCopyBuffer}; use flutter_rust_bridge::{StreamSink, ZeroCopyBuffer};
use hbb_common::ResultType; use hbb_common::ResultType;
use hbb_common::{ use hbb_common::{
@ -37,12 +37,12 @@ fn initialize(app_dir: &str) {
} }
pub fn start_event_stream(s: StreamSink<String>) -> ResultType<()> { pub fn start_event_stream(s: StreamSink<String>) -> ResultType<()> {
let _ = mobile::EVENT_STREAM.write().unwrap().insert(s); let _ = flutter::EVENT_STREAM.write().unwrap().insert(s);
Ok(()) Ok(())
} }
pub fn start_rgba_stream(s: StreamSink<ZeroCopyBuffer<Vec<u8>>>) -> ResultType<()> { pub fn start_rgba_stream(s: StreamSink<ZeroCopyBuffer<Vec<u8>>>) -> ResultType<()> {
let _ = mobile::RGBA_STREAM.write().unwrap().insert(s); let _ = flutter::RGBA_STREAM.write().unwrap().insert(s);
Ok(()) Ok(())
} }