diff --git a/android/app/src/main/java/com/hyzq/boss/MainActivity.java b/android/app/src/main/java/com/hyzq/boss/MainActivity.java index f5f59dd..fcc756f 100644 --- a/android/app/src/main/java/com/hyzq/boss/MainActivity.java +++ b/android/app/src/main/java/com/hyzq/boss/MainActivity.java @@ -13,6 +13,7 @@ import android.widget.Button; import android.widget.EditText; import android.widget.LinearLayout; import android.widget.ProgressBar; +import android.widget.ScrollView; import android.widget.TextView; import android.widget.Toast; @@ -60,6 +61,7 @@ public class MainActivity extends AppCompatActivity { private Button tabDevices; private Button tabMe; private SwipeRefreshLayout screenRefresh; + private ScrollView screenScroll; private LinearLayout screenContent; private String activeTab = "conversations"; @@ -174,6 +176,7 @@ public class MainActivity extends AppCompatActivity { tabDevices = findViewById(R.id.tab_devices); tabMe = findViewById(R.id.tab_me); screenRefresh = findViewById(R.id.screen_refresh); + screenScroll = findViewById(R.id.screen_scroll); screenContent = findViewById(R.id.screen_content); String[] rootTabs = WechatSurfaceMapper.rootTabLabels(); @@ -227,6 +230,14 @@ public class MainActivity extends AppCompatActivity { } return false; }); + if (screenScroll != null) { + screenScroll.setOnTouchListener((v, event) -> { + if (conversationPagerGestureDetector != null) { + conversationPagerGestureDetector.onTouchEvent(event); + } + return false; + }); + } } private void applyInitialTab(@Nullable Intent intent) { diff --git a/android/app/src/main/res/layout/activity_main.xml b/android/app/src/main/res/layout/activity_main.xml index cb13d10..5d4e1b5 100644 --- a/android/app/src/main/res/layout/activity_main.xml +++ b/android/app/src/main/res/layout/activity_main.xml @@ -118,8 +118,10 @@