[leanback] change dev update

app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java

@@ -299,9 +299,6 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
             case SEARCH:
                 CollectActivity.start(this, event.getText(), true);
                 break;
-            case UPDATE:
-                Updater.get().force().branch(event.getText()).start();
-                break;
             case PUSH:
                 if (ApiConfig.get().getSite("push_agent") == null) return;
                 DetailActivity.start(this, "push_agent", event.getText(), "", true);

app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java

@@ -68,9 +68,10 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit
         mBinding.wall.setOnClickListener(view -> ConfigDialog.create(this).type(2).show());
         mBinding.vodHistory.setOnClickListener(view -> HistoryDialog.create(this).type(0).show());
         mBinding.liveHistory.setOnClickListener(view -> HistoryDialog.create(this).type(1).show());
-        mBinding.version.setOnClickListener(view -> Updater.get().force().start());
         mBinding.wallDefault.setOnClickListener(view -> setWallDefault());
         mBinding.wallRefresh.setOnClickListener(view -> setWallRefresh());
+        mBinding.version.setOnLongClickListener(view -> onVersion(true));
+        mBinding.version.setOnClickListener(view -> onVersion(false));
         mBinding.quality.setOnClickListener(view -> setQuality());
         mBinding.player.setOnClickListener(view -> setPlayer());
         mBinding.decode.setOnClickListener(view -> setDecode());
@@ -157,6 +158,12 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit
         LiveConfig.get().setHome(item);
     }
 
+    private boolean onVersion(boolean dev) {
+        if (dev) Updater.get().force().dev().start();
+        else Updater.get().force().start();
+        return true;
+    }
+
     private void setQuality() {
         int index = Prefers.getQuality();
         String[] array = ResUtil.getStringArray(R.array.select_quality);

app/src/main/java/com/fongmi/android/tv/api/Updater.java

@@ -60,8 +60,8 @@ public class Updater implements Download.Callback {
         return this;
     }
 
-    public Updater branch(String branch) {
-        this.branch = branch;
+    public Updater dev() {
+        this.branch = Github.DEV;
         return this;
     }
 

app/src/main/java/com/fongmi/android/tv/event/ServerEvent.java

@@ -11,10 +11,6 @@ public class ServerEvent {
         EventBus.getDefault().post(new ServerEvent(Type.SEARCH, text));
     }
 
-    public static void update(String text) {
-        EventBus.getDefault().post(new ServerEvent(Type.UPDATE, text));
-    }
-
     public static void push(String text) {
         EventBus.getDefault().post(new ServerEvent(Type.PUSH, text));
     }
@@ -37,6 +33,6 @@ public class ServerEvent {
     }
 
     public enum Type {
-        SEARCH, UPDATE, PUSH, API
+        SEARCH, PUSH, API
     }
 }

app/src/main/java/com/fongmi/android/tv/server/Nano.java

@@ -177,8 +177,6 @@ public class Nano extends NanoHTTPD {
 
         void onSearch(String text);
 
-        void onUpdate(String text);
-
         void onPush(String text);
 
         void onApi(String text);

app/src/main/java/com/fongmi/android/tv/server/Server.java

@@ -90,11 +90,6 @@ public class Server implements Nano.Listener {
         if (text.length() > 0) ServerEvent.search(text);
     }
 
-    @Override
-    public void onUpdate(String text) {
-        if (text.length() > 0) ServerEvent.update(text);
-    }
-
     @Override
     public void onPush(String text) {
         if (text.length() > 0) ServerEvent.push(text);

app/src/main/java/com/fongmi/android/tv/server/process/InputRequestProcess.java

@@ -27,9 +27,6 @@ public class InputRequestProcess implements RequestProcess {
             case "search":
                 nano.getListener().onSearch(params.get("word").trim());
                 break;
-            case "update":
-                nano.getListener().onUpdate(params.get("branch").trim());
-                break;
             case "push":
                 nano.getListener().onPush(params.get("url").trim());
                 break;

app/src/main/res/raw/index.html

@@ -47,8 +47,7 @@
                                     <div class="weui-cell weui-cell_active weui-cell_vcode weui-cell_wrap">
                                         <div class="weui-cell__bd weui-flex">
                                             <input id="push_url" class="weui-input weui-cell__control weui-cell__control_flex" type="text" value="" placeholder="請輸入網址..." />
-                                            <button onclick="push(); return false;" class="weui-cell__control weui-btn weui-btn_default weui-vcode-btn" style="margin-right: 16px;">確定</button>
-                                            <button id="update" onclick="update(); return false;" class="weui-cell__control weui-btn weui-btn_default weui-vcode-btn">內測</button>
+                                            <button onclick="push(); return false;" class="weui-cell__control weui-btn weui-btn_default weui-vcode-btn">確定</button>
                                         </div>
                                     </div>
                                 </div>

app/src/main/res/raw/script.js

@@ -8,11 +8,6 @@ function search() {
     doAction('search', { word: $('#keyword').val() });
 }
 
-function update() {
-    doAction('update', { branch: "dev" });
-    $('#update').attr("disabled", true);
-}
-
 function push() {
     doAction('push', { url: $('#push_url').val() });
 }