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
@@ -12,6 +12,9 @@ from enum import IntEnum
|
||||
|
||||
from .._core import Stub, AndroidOnlyError
|
||||
from ..java.lang import RuntimeException, IllegalArgumentException, IllegalStateException
|
||||
from .app import Fragment as _BaseFragment
|
||||
from .app import FragmentManager as _BaseFragmentManager
|
||||
from .app import FragmentTransaction as _BaseFragmentTransaction
|
||||
|
||||
|
||||
# ═══════════════════════════════════════════════════════════════
|
||||
@@ -62,8 +65,8 @@ POP_BACK_STACK_INCLUSIVE = 1
|
||||
# Fragment
|
||||
# ═══════════════════════════════════════════════════════════════
|
||||
|
||||
class Fragment(Stub):
|
||||
"""Fragment — 片段基类 (桌面存根)"""
|
||||
class Fragment(_BaseFragment):
|
||||
"""Fragment — 片段基类 (桌面存根,继承 app.Fragment 的所有方法)"""
|
||||
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
@@ -426,8 +429,8 @@ class Fragment(Stub):
|
||||
# FragmentManager
|
||||
# ═══════════════════════════════════════════════════════════════
|
||||
|
||||
class FragmentManager(Stub):
|
||||
"""FragmentManager — 片段管理器"""
|
||||
class FragmentManager(_BaseFragmentManager):
|
||||
"""FragmentManager — 片段管理器 (继承 app.FragmentManager 的所有方法)"""
|
||||
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
@@ -538,8 +541,8 @@ class FragmentManager(Stub):
|
||||
# FragmentTransaction
|
||||
# ═══════════════════════════════════════════════════════════════
|
||||
|
||||
class FragmentTransaction(Stub):
|
||||
"""FragmentTransaction — 片段事务"""
|
||||
class FragmentTransaction(_BaseFragmentTransaction):
|
||||
"""FragmentTransaction — 片段事务 (继承 app.FragmentTransaction 的所有方法)"""
|
||||
|
||||
TRANSIT_ENTER_MASK = TRANSIT_ENTER_MASK
|
||||
TRANSIT_EXIT_MASK = TRANSIT_EXIT_MASK
|
||||
|
||||
Reference in new issue
Block a user