diff --git a/app/src/main/java/org/autojs/autojs/ui/main/scripts/MyScriptListFragment.java b/app/src/main/java/org/autojs/autojs/ui/main/scripts/MyScriptListFragment.java index 7b405475..a8fd7241 100644 --- a/app/src/main/java/org/autojs/autojs/ui/main/scripts/MyScriptListFragment.java +++ b/app/src/main/java/org/autojs/autojs/ui/main/scripts/MyScriptListFragment.java @@ -5,7 +5,9 @@ import android.os.Bundle; import android.preference.PreferenceManager; import android.support.annotation.Nullable; import android.support.design.widget.FloatingActionButton; +import android.support.v7.widget.RecyclerView; +import com.stardust.app.GlobalAppContext; import com.stardust.util.BackPressedHandler; import com.stardust.util.IntentUtil; @@ -26,6 +28,7 @@ import org.autojs.autojs.ui.main.ViewPagerFragment; import org.autojs.autojs.ui.project.ProjectConfigActivity; import org.autojs.autojs.ui.project.ProjectConfigActivity_; import org.autojs.autojs.ui.viewmodel.ExplorerItemList; +import org.autojs.autojs.ui.widget.ExpandableRecyclerView; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -63,7 +66,7 @@ public class MyScriptListFragment extends ViewPagerFragment implements FloatingA if (item.isEditable()) { Scripts.edit(item.toScriptFile()); } else { - IntentUtil.viewFile(getContext(), item.getPath()); + IntentUtil.viewFile(GlobalAppContext.get(), item.getPath()); } }); } @@ -82,7 +85,7 @@ public class MyScriptListFragment extends ViewPagerFragment implements FloatingA private void initFloatingActionMenuIfNeeded(final FloatingActionButton fab) { if (mFloatingActionMenu != null) return; - mFloatingActionMenu = ((FloatingActionMenu) getActivity().findViewById(R.id.floating_action_menu)); + mFloatingActionMenu = getActivity().findViewById(R.id.floating_action_menu); mFloatingActionMenu.getState() .observeOn(AndroidSchedulers.mainThread()) .subscribe(new SimpleObserver() { diff --git a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityService.java b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityService.java index 203410d3..79122996 100644 --- a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityService.java +++ b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityService.java @@ -61,7 +61,7 @@ public class AccessibilityService extends android.accessibilityservice.Accessibi int type = event.getEventType(); if (type == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED || type == AccessibilityEvent.TYPE_VIEW_FOCUSED) { - AccessibilityNodeInfo root = super.getRootInActiveWindow(); + AccessibilityNodeInfo root = getRootInActiveWindow(); if (root != null) { mFastRootInActiveWindow = root; } @@ -109,7 +109,7 @@ public class AccessibilityService extends android.accessibilityservice.Accessibi public AccessibilityNodeInfo getRootInActiveWindow() { try { return super.getRootInActiveWindow(); - } catch (IllegalStateException e) { + } catch (Exception e) { return null; } }