Skip to content

Commit 70931c4

Browse files
committed
onHeaderPulling传递的参数转换为RN的单位
1 parent 42e94d8 commit 70931c4

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

android/src/main/java/com/lmy/smartrefreshlayout/SmartRefreshLayoutManager.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.graphics.Color;
44
import android.support.annotation.NonNull;
5+
import android.view.Display;
56
import android.view.View;
67

78
import com.facebook.react.bridge.Arguments;
@@ -15,13 +16,15 @@
1516
import com.facebook.react.uimanager.annotations.ReactPropGroup;
1617
import com.facebook.react.uimanager.events.RCTEventEmitter;
1718
import com.lmy.header.AnyHeader;
19+
import com.scwang.smartrefresh.header.waveswipe.DisplayUtil;
1820
import com.scwang.smartrefresh.layout.api.RefreshFooter;
1921
import com.scwang.smartrefresh.layout.api.RefreshHeader;
2022
import com.scwang.smartrefresh.layout.api.RefreshLayout;
2123
import com.scwang.smartrefresh.layout.constant.RefreshState;
2224
import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
2325
import com.scwang.smartrefresh.layout.listener.OnMultiPurposeListener;
2426
import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
27+
import com.scwang.smartrefresh.layout.util.DensityUtil;
2528

2629
import java.util.List;
2730
import java.util.Map;
@@ -174,8 +177,8 @@ protected void addEventEmitters(ThemedReactContext reactContext, ReactSmartRefre
174177
public void onHeaderPulling(RefreshHeader header, float percent, int offset, int headerHeight, int extendHeight) {
175178
WritableMap writableMap = Arguments.createMap();
176179
writableMap.putDouble("percent",percent);
177-
writableMap.putInt("offset",offset);
178-
writableMap.putInt("headerHeight",headerHeight);
180+
writableMap.putDouble("offset",DensityUtil.px2dp(offset));
181+
writableMap.putDouble("headerHeight",DensityUtil.px2dp(headerHeight));
179182
mEventEmitter.receiveEvent(getTargetId(),Events.HEADER_PULLING.toString(),writableMap);
180183
}
181184

0 commit comments

Comments
 (0)