[platform] remove app icon and get bigger app name

- remove app icon
- get app name bigger
- support one env variable to start app

Author: dna2github

app/src/main/java/seven/drawalive/nodebase/NodeBase.java

@@ -28,6 +28,7 @@
 import java.net.NetworkInterface;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 
 
@@ -147,6 +148,12 @@ protected LinearLayout prepareLayout() {
       subview.addView(_btnRefreshAppList);
       view.addView(subview);
 
+      _txtEnv = new EditText(this);
+      _txtEnv.setText("");
+      _txtEnv.setHint("Environment KeyValue ...");
+      _txtEnv.setVisibility(View.GONE);
+      view.addView(_txtEnv);
+
       _txtAppFilter = new EditText(this);
       _txtAppFilter.setText("");
       _txtAppFilter.setHint("Filter app ...");
@@ -268,12 +275,16 @@ protected void refreshAppList() {
             if ("node_modules".compareTo(name) == 0) continue;
             if (name.indexOf('.') == 0) continue;
             Log.i("UI:AppList", f.getAbsolutePath());
-            NodeBaseApp app = new NodeBaseApp(this, new AppAction(this), f);
+            HashMap<String, Object> env = new HashMap<>();
+            env.put("appdir", f);
+            env.put("txtenv", _txtEnv);
+            NodeBaseApp app = new NodeBaseApp(this, new AppAction(this), env);
             _appList.add(app);
             _panelAppList.addView(app);
          }
          if (_appList.size() > 0) {
             _txtAppFilter.setText("");
+            _txtEnv.setVisibility(View.VISIBLE);
             _txtAppFilter.setVisibility(View.VISIBLE);
          }
       } catch (Exception e) {
@@ -341,6 +352,7 @@ private void show_node_version() {
    private TextView _labelIp;
    private EditText _txtAppRootDir;
    private Button _btnRefreshAppList;
+   private EditText _txtEnv;
    private EditText _txtAppFilter;
    private LinearLayout _panelAppList;
 }

app/src/main/java/seven/drawalive/nodebase/NodeBaseApp.java

@@ -4,6 +4,7 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
@@ -16,13 +17,15 @@
 import android.widget.TextView;
 
 import java.io.File;
+import java.util.HashMap;
 
 public class NodeBaseApp extends LinearLayout {
-   public NodeBaseApp(Context context, NodeBase.AppAction delegate, File appdir) {
+   public NodeBaseApp(Context context, NodeBase.AppAction delegate, HashMap<String, Object> env) {
       super(context);
       setOrientation(LinearLayout.VERTICAL);
+      _env = env;
       _delegate = delegate;
-      _appdir = appdir;
+      _appdir = (File)env.get("appdir");
 
       collectAppInformation();
       prepareLayout();
@@ -68,32 +71,13 @@ public void prepareLayout() {
       LinearLayout frame = new LinearLayout(context);
       frame.setOrientation(LinearLayout.HORIZONTAL);
 
-      ImageView image = new ImageView(context);
-      LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(64, 64);
-      params.setMargins(1, 1, 1, 1);
-      image.setLayoutParams(params);
-      image.setMaxHeight(64);
-      image.setMaxWidth(64);
-      image.setMinimumHeight(64);
-      image.setMinimumWidth(64);
-      try {
-         File imgfile = new File(_appdir.getAbsolutePath().concat("/icon.png"));
-         if (imgfile.exists()) {
-            Bitmap bmp = BitmapFactory.decodeFile(imgfile.getAbsolutePath());
-            image.setImageBitmap(bmp);
-         } else {
-            image.setBackgroundResource(R.drawable.default_icon);
-         }
-      } catch (Exception e) {
-      }
-      frame.addView(image);
-
       LinearLayout contents = new LinearLayout(context);
       contents.setOrientation(LinearLayout.VERTICAL);
 
       TextView label;
       label = new TextView(context);
-      label.setText(String.format("\n=============== App: %s ===", _appdir.getName()));
+      label.setText(String.format("\nApp: %s", _appdir.getName()));
+      label.setTextSize(TypedValue.COMPLEX_UNIT_SP, 24f);
       contents.addView(label);
       label = new TextView(context);
       label.setText(_readme);
@@ -154,7 +138,8 @@ public void onClick(View view) {
                         "start",
                         _appdir.getAbsolutePath(),
                         String.valueOf(_listEntries.getSelectedItem()),
-                        _txtParams.getText().toString()
+                        _txtParams.getText().toString(),
+                        ((EditText)_env.get("txtenv")).getText().toString()
                   });
          }
       });
@@ -197,6 +182,7 @@ public String getAppName() {
       return _appdir.getName();
    }
 
+   private HashMap<String, Object> _env;
    private NodeBase.AppAction _delegate;
    private File _appdir;
    private String[] _appentries;

app/src/main/java/seven/drawalive/nodebase/NodeBaseServer.java

@@ -34,7 +34,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                case "start":
                   Log.i("Server:Command",
                         String.format("Server starts for \"%s\" at \"%s\"", args[2], args[1]));
-                  startNode(args[1], args[2], args[3]);
+                  startNode(args[1], args[2], args[3], args[4]);
                   break;
                case "restart":
                   Log.i("Server:Command",
@@ -113,13 +113,14 @@ public static String nodeVersion(String _workdir) {
       }
    }
 
-   public int startNode(String appdir, String appentry, String appparams) {
+   public int startNode(String appdir, String appentry, String appparams, String env) {
       if (!_valid) return -1;
       int result = 0;
       _crash = true;
       _appdir = appdir;
       _appentry = appentry;
       _appparams = appparams;
+      _env = env;
       Utils.setServiceInfo(new String[] {_appdir, _appentry});
 
       if (_node != null) {
@@ -144,7 +145,13 @@ public int startNode(String appdir, String appentry, String appparams) {
       }
       Log.i("Server:Start", String.format("Command - %s", cmd));
       try {
-         _node = new NodeMonitor(this, Runtime.getRuntime().exec(cmd));
+         if (_env != null && _env.length() > 0) {
+            _node = new NodeMonitor(this, Runtime.getRuntime().exec(
+                  cmd, new String[] { _env }
+            ));
+         } else {
+            _node = new NodeMonitor(this, Runtime.getRuntime().exec(cmd));
+         }
          _node.start();
       } catch (Exception e) {
          Log.e("Server:Start", "Cannot start \"node\"", e);
@@ -158,7 +165,7 @@ public int restartNode() {
       if (!_valid) return -1;
       int result = 0;
       stopNode();
-      startNode(_appdir, _appentry, _appparams);
+      startNode(_appdir, _appentry, _appparams, _env);
       return result;
    }
 
@@ -183,7 +190,7 @@ public void onNodeTerminated() {
    }
 
    private boolean _valid, _crash;
-   private String _workdir, _appdir, _appentry, _appparams;
+   private String _workdir, _appdir, _appentry, _appparams, _env;
    private NodeMonitor _node;
 
 }