fix: 系统性修复类继承冲突 + 补全36+缺失导出
类继承冲突修复 (7个文件, 8组冲突): - view_ext.py: 16个类继承view.py基础版本 (ViewOutlineProvider, ViewPropertyAnimator, ViewTreeObserver, ViewConfiguration, ViewParent, WindowInsets, Display, DragEvent, GestureDetector, ScaleGestureDetector, SoundEffectConstants, Surface, SurfaceView, TextureView, VelocityTracker, WindowInsetsController) - hardware_sensor_ext.py: 3个类继承hardware.py (Sensor, SensorEvent, SensorEventListener) - app_fragment.py: 3个类继承app.py (Fragment, FragmentManager, FragmentTransaction) - content_intent.py: 3个类继承content.py/app.py (Intent, PendingIntent, IntentFilter) - widget_ext.py: 29个类继承widget.py (18个单继承+11个多继承, 修复super()链) - os_power.py: 2个类继承os.py (BatteryManager, PowerManager) - net_ext.py: 12个类继承net.py (11个单继承+1个多继承) __all__导出补全 (36个类): - java.net: InterfaceAddress - android.database: MatrixCursor, SQLiteStatement - android.view: GestureDetector, ScaleGestureDetector, SurfaceHolder, Surface, SurfaceView, TextureView, ViewOutlineProvider, WindowManager, Window, LayoutInflater, Menu, MenuItem, ContextMenu, Display, DisplayMetrics - android.graphics: Region, PathMeasure, NinePatch, Picture, PictureDrawable, Camera, PorterDuff, PorterDuffXfermode, Shader, LinearGradient, RadialGradient, SweepGradient, BitmapShader, ComposeShader, CornerPathEffect, DashPathEffect, PathDashPathEffect, SumPathEffect - android.widget: LinearLayout, FrameLayout, RelativeLayout, TableLayout, TableRow, BaseAdapter, ArrayAdapter, SimpleAdapter, CursorAdapter, ImageButton, ToggleButton, RadioButton, SeekBar, RatingBar, ViewSwitcher, TextSwitcher, ImageSwitcher, SearchView, NumberPicker, Chronometer, TabHost, TabWidget, ViewAnimator, ZoomControls, DigitalClock, AnalogClock 统计: 221模块, 3666类, 31005方法, 183629行
This commit is contained in:
1 parent
fbb8263b13
commit
97d8b277d5
8 files changed
+205
-105
No files matched your search
@@ -14,6 +14,9 @@ from typing import Any, Callable, Dict, List, Optional, Tuple
|
||||
|
||||
from .._core import Stub, AndroidOnlyError
|
||||
from .hardware import SensorManager as _BaseSensorManager
|
||||
from .hardware import Sensor as _BaseSensor
|
||||
from .hardware import SensorEvent as _BaseSensorEvent
|
||||
from .hardware import SensorEventListener as _BaseSensorEventListener
|
||||
|
||||
__all__ = [
|
||||
"Sensor", "SensorEvent", "SensorEventListener",
|
||||
@@ -102,8 +105,8 @@ AXIS_MINUS_Z = 6
|
||||
# Sensor (扩展)
|
||||
# ═══════════════════════════════════════════════════════════════
|
||||
|
||||
class Sensor(Stub):
|
||||
"""Sensor — 传感器 (完整版)"""
|
||||
class Sensor(_BaseSensor):
|
||||
"""Sensor — 传感器 (完整版,继承 hardware.Sensor 的所有方法)"""
|
||||
|
||||
TYPE_ACCELEROMETER = TYPE_ACCELEROMETER
|
||||
TYPE_MAGNETIC_FIELD = TYPE_MAGNETIC_FIELD
|
||||
@@ -154,7 +157,8 @@ class Sensor(Stub):
|
||||
fifo_reserved_event_count: int = 0,
|
||||
fifo_max_event_count: int = 0,
|
||||
id_: int = 0):
|
||||
super().__init__()
|
||||
super().__init__(type_, name, vendor, version, resolution,
|
||||
max_range, power, min_delay)
|
||||
self._type = type_
|
||||
self._name = name
|
||||
self._vendor = vendor
|
||||
@@ -249,14 +253,17 @@ class Sensor(Stub):
|
||||
# SensorEvent
|
||||
# ═══════════════════════════════════════════════════════════════
|
||||
|
||||
class SensorEvent(Stub):
|
||||
"""SensorEvent — 传感器事件"""
|
||||
class SensorEvent(_BaseSensorEvent):
|
||||
"""SensorEvent — 传感器事件 (继承 hardware.SensorEvent 的所有方法)"""
|
||||
|
||||
def __init__(self, sensor: Optional[Sensor] = None,
|
||||
values: List[float] = None,
|
||||
accuracy: int = SENSOR_STATUS_ACCURACY_HIGH,
|
||||
timestamp: int = 0):
|
||||
super().__init__()
|
||||
if sensor is not None:
|
||||
super().__init__(sensor, accuracy)
|
||||
else:
|
||||
Stub.__init__(self)
|
||||
self.sensor = sensor
|
||||
self.values = values or [0.0, 0.0, 0.0]
|
||||
self.accuracy = accuracy
|
||||
@@ -291,8 +298,8 @@ class SensorEvent(Stub):
|
||||
# SensorEventListener
|
||||
# ═══════════════════════════════════════════════════════════════
|
||||
|
||||
class SensorEventListener(Stub):
|
||||
"""SensorEventListener — 传感器事件监听器"""
|
||||
class SensorEventListener(_BaseSensorEventListener):
|
||||
"""SensorEventListener — 传感器事件监听器 (继承 hardware.SensorEventListener 的所有方法)"""
|
||||
|
||||
def onSensorChanged(self, event: SensorEvent):
|
||||
pass
|
||||
|
||||
Reference in new issue
Block a user