zhuguifei
2025-12-31 a5a64b0bdc4e90e265cbff767c09351ea82f113a
删除多余代码
已修改3个文件
已删除17个文件
3545 ■■■■■ 文件已修改
app/src/main/AndroidManifest.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/shlb/comb/activity/ConnActivity.java 444 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/shlb/comb/activity/NormalWriteActivity.java 536 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/shlb/comb/activity/WriteActivity.java 627 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/shlb/comb/activity/WriteActivity2.java 531 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/shlb/comb/adapter/DeviceListAdapter.java 83 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/shlb/comb/adapter/DeviceListAdapter2.java 137 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/shlb/comb/adapter/WriteAdapter.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/shlb/comb/fragment/DeviceListFragment.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/shlb/comb/manager/BleGlobalManager.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_base.xml 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_conn.xml 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_write.xml 315 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_write2.xml 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/dialog_layout_bluetooth_item.xml 91 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/dialog_layout_bluetooth_list.xml 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/dialog_layout_write_item.xml 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/dialog_layout_write_list.xml 75 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/list_item_device.xml 201 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/normal_activity_write.xml 304 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/AndroidManifest.xml
@@ -50,18 +50,11 @@
        <activity android:name=".activity.HomeActivity"
            android:screenOrientation="portrait"
            />
        <activity android:name=".activity.ConnActivity"
            android:screenOrientation="portrait"
            />
        <activity android:name=".activity.WriteActivity"
            android:screenOrientation="portrait"
            />
        <activity android:name=".activity.CurrentDeviceActivity"
            android:screenOrientation="portrait"
            />
        <activity android:name=".activity.TestActivity"
            android:screenOrientation="portrait" />
        <activity android:name=".activity.NormalWriteActivity" />
    </application>
app/src/main/java/com/shlb/comb/activity/ConnActivity.java
文件已删除
app/src/main/java/com/shlb/comb/activity/NormalWriteActivity.java
文件已删除
app/src/main/java/com/shlb/comb/activity/WriteActivity.java
文件已删除
app/src/main/java/com/shlb/comb/activity/WriteActivity2.java
文件已删除
app/src/main/java/com/shlb/comb/adapter/DeviceListAdapter.java
文件已删除
app/src/main/java/com/shlb/comb/adapter/DeviceListAdapter2.java
文件已删除
app/src/main/java/com/shlb/comb/adapter/WriteAdapter.java
文件已删除
app/src/main/java/com/shlb/comb/fragment/DeviceListFragment.java
@@ -26,7 +26,6 @@
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
import com.shlb.comb.R;
import com.shlb.comb.activity.ConnActivity;
import com.shlb.comb.activity.TestActivity;
import com.shlb.comb.activity.HomeActivity;
import com.shlb.comb.adapter.HomeDeviceListAdapter;
@@ -94,7 +93,9 @@
    @Override
    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
        super.onViewCreated(view, savedInstanceState);
        EventBus.getDefault().register(this);
        if (!EventBus.getDefault().isRegistered(this)) {
            EventBus.getDefault().register(this);
        }
        initView();
        initData();
    }
@@ -349,10 +350,14 @@
    public void onDestroyView() {
        super.onDestroyView();
        dismissLoading();
        EventBus.getDefault().unregister(this);
        if (EventBus.getDefault().isRegistered(this)) {
            EventBus.getDefault().unregister(this);
        }
        if (scanManager != null) {
            scanManager.setScanCallbackCompat(null);
            scanManager.setScanOverListener(null);
            // 閲婃斁璧勬簮
            scanManager.release();
        }
    }
}
app/src/main/java/com/shlb/comb/manager/BleGlobalManager.java
@@ -53,7 +53,7 @@
    }
    public void connect(Context context, BluetoothLeDevice device) {
        this.mContext = context;
        this.mContext = context.getApplicationContext();
        if (connectManager == null) {
            connectManager = BluetoothConnectManager.getInstance(mContext);
            connectManager.addConnectStateListener(stateListener);
app/src/main/res/layout/activity_base.xml
文件已删除
app/src/main/res/layout/activity_conn.xml
文件已删除
app/src/main/res/layout/activity_write.xml
文件已删除
app/src/main/res/layout/activity_write2.xml
文件已删除
app/src/main/res/layout/dialog_layout_bluetooth_item.xml
文件已删除
app/src/main/res/layout/dialog_layout_bluetooth_list.xml
文件已删除
app/src/main/res/layout/dialog_layout_write_item.xml
文件已删除
app/src/main/res/layout/dialog_layout_write_list.xml
文件已删除
app/src/main/res/layout/list_item_device.xml
文件已删除
app/src/main/res/layout/normal_activity_write.xml
文件已删除