Skip to content

Commit 6884282

Browse files
committed
remove harmony binding log
1 parent d703fc6 commit 6884282

File tree

3 files changed

+18
-26
lines changed

3 files changed

+18
-26
lines changed

GaiaXAndroid/src/androidTest/java/com/alibaba/gaiax/GXComponentGridTest.kt

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -376,17 +376,13 @@ class GXComponentGridTest : GXBaseTest() {
376376
gxTemplateContext: GXTemplateContext,
377377
gridConfig: GXGridConfig
378378
): Any? {
379-
if (propertyName == GXTemplateKey.GAIAX_LAYER_COLUMN && gridConfig.data.getBooleanValue(
380-
"responsive-enable"
381-
)
382-
) {
379+
if (propertyName == GXTemplateKey.GAIAX_LAYER_COLUMN && gridConfig.data.getBooleanValue("responsive-enable")) {
383380
if (gridConfig.column == 2) {
384381
return 3
385382
}
386383
}
387384
return null
388385
}
389-
390386
})
391387

392388
val templateItem = GXTemplateEngine.GXTemplateItem(
@@ -1210,10 +1206,7 @@ class GXComponentGridTest : GXBaseTest() {
12101206
Assert.assertEquals(1080F.dpToPx(), rootView.width())
12111207
Assert.assertEquals(100F.dpToPx(), rootView.height())
12121208
Assert.assertEquals(true, (rootView as? RecyclerView)?.layoutManager?.canScrollVertically())
1213-
Assert.assertEquals(
1214-
false,
1215-
(rootView as? RecyclerView)?.layoutManager?.canScrollHorizontally()
1216-
)
1209+
Assert.assertEquals(false, (rootView as? RecyclerView)?.layoutManager?.canScrollHorizontally())
12171210
}
12181211

12191212
@Test

GaiaXAndroid/src/main/kotlin/com/alibaba/gaiax/render/view/container/slider/GXSliderDefaultIndicatorView.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ class GXSliderDefaultIndicatorView : GXSliderBaseIndicatorView {
6464

6565
override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
6666
setMeasuredDimension(
67-
((indicatorCount - 1) * INDICATOR_NORMAL_WIDTH + INDICATOR_SELECTED_WIDTH
68-
+ (indicatorCount - 1) * INDICATOR_SPACING).toInt(),
67+
((indicatorCount - 1) * INDICATOR_NORMAL_WIDTH + INDICATOR_SELECTED_WIDTH + (indicatorCount - 1) * INDICATOR_SPACING).toInt(),
6968
INDICATOR_HEIGHT.toInt()
7069
)
7170
}

GaiaXStretch/bindings/harmony/src/lib.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -215,22 +215,22 @@ pub unsafe extern "C" fn stretch_style_free(style: *mut c_void) {
215215

216216
#[no_mangle]
217217
pub unsafe extern "C" fn stretch_init() -> *mut c_void {
218-
hilog_debug_wrapper_str("stretch_init");
218+
// hilog_debug_wrapper_str("stretch_init");
219219

220220
let stretch = stretch::node::Stretch::new();
221221
Box::into_raw(Box::new(stretch)) as *mut c_void
222222
}
223223

224224
#[no_mangle]
225225
pub unsafe extern "C" fn stretch_free(stretch: *mut c_void) {
226-
hilog_debug_wrapper_str("stretch_free");
226+
// hilog_debug_wrapper_str("stretch_free");
227227

228228
let _stretch = Box::from_raw(stretch as *mut Stretch);
229229
}
230230

231231
#[no_mangle]
232232
pub unsafe extern "C" fn stretch_node_create(stretch: *mut c_void, style: *mut c_void) -> *mut c_void {
233-
hilog_debug_wrapper_str("stretch_node_create");
233+
// hilog_debug_wrapper_str("stretch_node_create");
234234

235235
let mut stretch = Box::from_raw(stretch as *mut Stretch);
236236
let style = Box::from_raw(style as *mut Style);
@@ -244,7 +244,7 @@ pub unsafe extern "C" fn stretch_node_create(stretch: *mut c_void, style: *mut c
244244

245245
#[no_mangle]
246246
pub unsafe extern "C" fn stretch_node_free(stretch: *mut c_void, node: *mut c_void) {
247-
hilog_debug_wrapper_str("stretch_node_free");
247+
// hilog_debug_wrapper_str("stretch_node_free");
248248

249249
let mut stretch = Box::from_raw(stretch as *mut Stretch);
250250
let node = Box::from_raw(node as *mut Node);
@@ -280,7 +280,7 @@ pub unsafe extern "C" fn stretch_node_set_measure(
280280

281281
#[no_mangle]
282282
pub unsafe extern "C" fn stretch_node_set_style(stretch: *mut c_void, node: *mut c_void, style: *mut c_void) {
283-
hilog_debug_wrapper_str("stretch_node_set_style");
283+
// hilog_debug_wrapper_str("stretch_node_set_style");
284284

285285
let mut stretch = Box::from_raw(stretch as *mut Stretch);
286286
let node = Box::from_raw(node as *mut Node);
@@ -295,7 +295,7 @@ pub unsafe extern "C" fn stretch_node_set_style(stretch: *mut c_void, node: *mut
295295

296296
#[no_mangle]
297297
pub unsafe extern "C" fn stretch_node_dirty(stretch: *mut c_void, node: *mut c_void) -> bool {
298-
hilog_debug_wrapper_str("stretch_node_dirty");
298+
// hilog_debug_wrapper_str("stretch_node_dirty");
299299

300300
let stretch = Box::from_raw(stretch as *mut Stretch);
301301
let node = Box::from_raw(node as *mut Node);
@@ -309,7 +309,7 @@ pub unsafe extern "C" fn stretch_node_dirty(stretch: *mut c_void, node: *mut c_v
309309

310310
#[no_mangle]
311311
pub unsafe extern "C" fn stretch_node_mark_dirty(stretch: *mut c_void, node: *mut c_void) {
312-
hilog_debug_wrapper_str("stretch_node_mark_dirty");
312+
// hilog_debug_wrapper_str("stretch_node_mark_dirty");
313313

314314
let mut stretch = Box::from_raw(stretch as *mut Stretch);
315315
let node = Box::from_raw(node as *mut Node);
@@ -322,7 +322,7 @@ pub unsafe extern "C" fn stretch_node_mark_dirty(stretch: *mut c_void, node: *mu
322322

323323
#[no_mangle]
324324
pub unsafe extern "C" fn stretch_node_add_child(stretch: *mut c_void, node: *mut c_void, child: *mut c_void) {
325-
hilog_debug_wrapper_str("stretch_node_add_child");
325+
// hilog_debug_wrapper_str("stretch_node_add_child");
326326

327327
let mut stretch = Box::from_raw(stretch as *mut Stretch);
328328
let node = Box::from_raw(node as *mut Node);
@@ -342,7 +342,7 @@ pub unsafe extern "C" fn stretch_node_replace_child_at_index(
342342
index: usize,
343343
child: *mut c_void,
344344
) {
345-
hilog_debug_wrapper_str("stretch_node_replace_child_at_index");
345+
// hilog_debug_wrapper_str("stretch_node_replace_child_at_index");
346346

347347
let mut stretch = Box::from_raw(stretch as *mut Stretch);
348348
let node = Box::from_raw(node as *mut Node);
@@ -357,7 +357,7 @@ pub unsafe extern "C" fn stretch_node_replace_child_at_index(
357357

358358
#[no_mangle]
359359
pub unsafe extern "C" fn stretch_node_remove_child(stretch: *mut c_void, node: *mut c_void, child: *mut c_void) {
360-
hilog_debug_wrapper_str("stretch_node_remove_child");
360+
// hilog_debug_wrapper_str("stretch_node_remove_child");
361361

362362
let mut stretch = Box::from_raw(stretch as *mut Stretch);
363363
let node = Box::from_raw(node as *mut Node);
@@ -372,7 +372,7 @@ pub unsafe extern "C" fn stretch_node_remove_child(stretch: *mut c_void, node: *
372372

373373
#[no_mangle]
374374
pub unsafe extern "C" fn stretch_node_remove_child_at_index(stretch: *mut c_void, node: *mut c_void, index: usize) {
375-
hilog_debug_wrapper_str("stretch_node_remove_child_at_index");
375+
// hilog_debug_wrapper_str("stretch_node_remove_child_at_index");
376376

377377
let mut stretch = Box::from_raw(stretch as *mut Stretch);
378378
let node = Box::from_raw(node as *mut Node);
@@ -393,7 +393,7 @@ pub unsafe extern "C" fn stretch_node_compute_layout(
393393
height: f32,
394394
create_layout: fn(*const f32, i32) -> *mut c_void,
395395
) -> *mut c_void {
396-
hilog_debug_wrapper_str("stretch_node_compute_layout");
396+
// hilog_debug_wrapper_str("stretch_node_compute_layout");
397397

398398
let mut stretch = Box::from_raw(stretch as *mut Stretch);
399399
let node = Box::from_raw(node as *mut Node);
@@ -415,7 +415,7 @@ pub unsafe extern "C" fn stretch_node_compute_layout(
415415
Box::leak(stretch);
416416

417417

418-
hilog_debug_wrapper_string(format!("create_layout ptr={:?} len={}",output.as_ptr(), output.len() ));
418+
// hilog_debug_wrapper_string(format!("create_layout ptr={:?} len={}",output.as_ptr(), output.len() ));
419419

420420

421421
create_layout(output.as_ptr(), output.len() as i32)
@@ -427,8 +427,8 @@ fn copy_output(stretch: &Stretch, node: Node, output: &mut Vec<f32>) {
427427
let layout = stretch.layout(node).unwrap();
428428
let children = stretch.children(node).unwrap();
429429

430-
hilog_debug_wrapper_string(format!("stretch_copy_output x={} y={} width={} height={} children={}",
431-
layout.location.x, layout.location.y, layout.size.width, layout.size.height,children.len() ));
430+
// hilog_debug_wrapper_string(format!("stretch_copy_output x={} y={} width={} height={} children={}",
431+
// layout.location.x, layout.location.y, layout.size.width, layout.size.height,children.len() ));
432432

433433
output.push(layout.location.x);
434434
output.push(layout.location.y);

0 commit comments

Comments
 (0)