v1.3

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.host900.goproxy"
         minSdkVersion 15
         targetSdkVersion 29
-        versionCode 3
+        versionCode 4
-        versionName "1.2"
+        versionName "1.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     splits {

app/src/main/java/com/host900/goproxy/MainActivity.java

@@ -12,11 +12,9 @@ import android.net.Uri;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.text.method.ScrollingMovementMethod;
+import android.util.Log;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.TextView;
@@ -28,33 +26,20 @@ import java.net.Inet4Address;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.SocketException;
+import java.util.ArrayList;
 import java.util.Enumeration;
+import java.util.Random;
 
-import snail007.proxysdk.LogCallback;
 import snail007.proxysdk.Proxysdk;
 
 public class MainActivity extends AppCompatActivity {
 
 
     String TAG = "HomeFragment";
-    String serviceID = "srv";
+    ArrayList<String> serviceIDs = new ArrayList();
-    int log_line_cnt = 0;
-
-    EditText log  ;
-
-    Handler handler=new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            String line=msg.getData().getString("line");
-            if (++log_line_cnt > 100) {
-                log.setText("");
-            }
-            log.append(line + "\n");
-        }
-    };
 
     public void onCreate(Bundle savedInstanceState) {
-         super.onCreate(savedInstanceState);
+        super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
         final EditText editText = findViewById(R.id.input);
@@ -64,20 +49,21 @@ public class MainActivity extends AppCompatActivity {
         final String args = config.getString("args", "");
         editText.setText(args);
         editText.addTextChangedListener(watcher(editor, editText));
+        editText.setHorizontallyScrolling(true);
+
 
-        TextView status = findViewById(R.id.tv_status);
-        log = (EditText) findViewById(R.id.log_output);
         TextView tip = findViewById(R.id.tip);
         TextView ipaddrs = findViewById(R.id.ip_addrs);
         String sdkVersion = Proxysdk.version();
         TextView viewManual = findViewById(R.id.view_manual);
         TextView joinQQ = findViewById(R.id.join_qq_group);
+        Log.d(TAG,Proxysdk.version());
         ipaddrs.setOnLongClickListener(new View.OnLongClickListener() {
             @Override
             public boolean onLongClick(View view) {
-                  ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+                ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-                 ClipData mClipData = ClipData.newPlainText("ip", ((TextView)view).getText());
+                ClipData mClipData = ClipData.newPlainText("ip", ((TextView) view).getText());
-                 cm.setPrimaryClip(mClipData);
+                cm.setPrimaryClip(mClipData);
                 Toast.makeText(view.getContext(), R.string.ip_copied, Toast.LENGTH_LONG).show();
                 return false;
             }
@@ -86,7 +72,7 @@ public class MainActivity extends AppCompatActivity {
             @Override
             public boolean onLongClick(View view) {
                 ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-                ClipData mClipData = ClipData.newPlainText("qq", ((TextView)view).getText());
+                ClipData mClipData = ClipData.newPlainText("qq", ((TextView) view).getText());
                 cm.setPrimaryClip(mClipData);
                 Toast.makeText(view.getContext(), R.string.qqcopied, Toast.LENGTH_LONG).show();
                 return false;
@@ -97,66 +83,71 @@ public class MainActivity extends AppCompatActivity {
         viewManual.getPaint().setAntiAlias(true);//抗锯齿
 
         getSupportActionBar().setTitle(getString(R.string.apptitle));
-        tip.setText(getString(R.string.hint0) + sdkVersion + getString(R.string.hint1));
+        tip.setText(getString(R.string.hint0) +" "+ sdkVersion +" "+ getString(R.string.hint1));
         ipaddrs.setText(getIpAddress(getBaseContext()));
 
         joinQQ.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG); //下划线
         joinQQ.getPaint().setAntiAlias(true);//抗锯齿
 
-        log.setMovementMethod(ScrollingMovementMethod.getInstance());
+        findViewById(R.id.btn_start).setOnClickListener(start(editText, this));
+        findViewById(R.id.btn_stop).setOnClickListener(stop(this));
 
-        //event
-        findViewById(R.id.btn_start).setOnClickListener(start(log, status, editText, this));
-        findViewById(R.id.btn_stop).setOnClickListener(stop(status, editText));
         viewManual.setOnClickListener(openURL("https://snail007.github.io/goproxy/manual/zh/#/"));
 //        joinQQ.setOnClickListener(openURL("https://jq.qq.com/?_wv=1027&k=5G2EwxR"));
 
         return;
     }
 
-    public View.OnClickListener stop(final TextView status, final EditText editText) {
+    public View.OnClickListener stop(final  Context ctx) {
         return new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Proxysdk.stop((serviceID));
+                stopService(ctx,true);
-                editText.setEnabled(true);
-                status.setText(R.string.stopped);
             }
         };
     }
 
-    public View.OnClickListener start(final EditText log, final TextView status, final EditText editText, final Context ctx) {
+    private void stopService(Context ctx,boolean show) {
+        for (String serviceID : serviceIDs) {
+            Proxysdk.stop(serviceID);
+        }
+        serviceIDs.clear();
+        if (show){
+            Toast.makeText(ctx, R.string.stopdone, Toast.LENGTH_LONG).show();
+        }
+    }
+
+    public View.OnClickListener start(final EditText editText, final Context ctx) {
 
         return new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                String args = editText.getText().toString().trim();
+                stopService(ctx,false);
-                if (args.indexOf("proxy") == 0 && args.length() >= 5) {
+                String[] lines = editText.getText().toString().trim().split("\n");
-                    args = args.substring(5);
+                boolean isEmpty = true;
+                for (int i = 0; i < lines.length; i++) {
+                    String args = lines[i];
+                    args = args.trim();
+                    if (args.isEmpty()) {
+                        continue;
+                    }
+                    isEmpty = false;
+                    if (args.indexOf("proxy") == 0 && args.length() >= 5) {
+                        args = args.substring(5);
+                    }
+                    String serviceID = String.format("%f-%d", new Random().nextDouble(), new Random().nextInt());
+                    String err = Proxysdk.start(serviceID, args, "");
+                    if (!err.isEmpty()) {
+                        Toast.makeText(ctx, err, Toast.LENGTH_LONG).show();
+                        return;
+                    }
+                    serviceIDs.add(serviceID);
                 }
-                if (args.replaceAll("\n","").length() == 0) {
+                if (isEmpty) {
                     Toast.makeText(ctx, R.string.argsisempty, Toast.LENGTH_LONG).show();
                     return;
                 }
-                String err = Proxysdk.startWithLog(serviceID, args, "", new LogCallback() {
+                Toast.makeText(ctx, R.string.startok, Toast.LENGTH_LONG).show();
-                    @Override
-                    public void write(String line) {
-                        Message msg=Message.obtain();
-                        msg.what=1;
-                        Bundle bundle=new Bundle();
-                        bundle.putString("line", line);
-                       msg.setData(bundle);
-                        handler.sendMessage(msg);
-                    }
-                });
-                if (!err.isEmpty()) {
-                    Toast.makeText(ctx, err, Toast.LENGTH_LONG).show();
-//                    Log.d(TAG, err);
-
-                } else {
-                    editText.setEnabled(false);
-                    status.setText("运行中");
-                }
             }
         };
     }
@@ -181,7 +172,7 @@ public class MainActivity extends AppCompatActivity {
     @Override
     public void onDestroy() {
         super.onDestroy();
-        Proxysdk.stop(serviceID);
+        stopService(this,false);
     }
 
     public TextWatcher watcher(final SharedPreferences.Editor editor, final EditText editText) {
@@ -232,7 +223,7 @@ public class MainActivity extends AppCompatActivity {
                 String ipAddress = intIP2StringIP(wifiInfo.getIpAddress());
                 return ipAddress;
             } else if (info.getType() == ConnectivityManager.TYPE_ETHERNET) {
-                // 有限网络
+                // 本地网络
                 return getLocalIp();
             }
         }
@@ -247,7 +238,7 @@ public class MainActivity extends AppCompatActivity {
     }
 
 
-    // 获取有限网IP
+    // 获取IP
     private static String getLocalIp() {
         try {
             for (Enumeration<NetworkInterface> en = NetworkInterface

app/src/main/res/layout/activity_main.xml

@@ -69,10 +69,9 @@
     <EditText
         android:id="@+id/input"
         android:layout_width="match_parent"
-        android:layout_height="130dp"
+        android:layout_height="155dp"
         android:background="@drawable/log_shape"
         android:gravity="top"
-        android:inputType="textMultiLine"
         android:scrollbars="vertical"
         android:selectAllOnFocus="false"
         android:singleLine="false"
@@ -96,16 +95,13 @@
 
     <TextView
         android:id="@+id/textView2"
-        android:layout_width="91dp"
+        android:layout_width="301dp"
-        android:layout_height="37dp"
+        android:layout_height="41dp"
+        android:layout_marginTop="108dp"
         android:padding="10dp"
         android:text="@string/args"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.006"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.182" />
+        tools:layout_editor_absoluteX="2dp" />
 
     <Button
         android:id="@+id/btn_start"
@@ -123,33 +119,6 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.513" />
 
-    <TextView
-        android:id="@+id/tv_status"
-        android:layout_width="72dp"
-        android:layout_height="25dp"
-        android:text="已停止"
-        android:textColor=" #ff1a1a"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="@+id/guideline"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.631" />
-
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="68dp"
-        android:layout_height="24dp"
-        android:paddingLeft="10dp"
-        android:text="状态："
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/guideline"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/view_manual"
-        app:layout_constraintVertical_bias="0.575" />
-
     <TextView
         android:id="@+id/textView3"
         android:layout_width="69dp"
@@ -163,18 +132,6 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.663" />
 
-    <TextView
-        android:id="@+id/textView4"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="10dp"
-        android:paddingBottom="3dp"
-        android:text="日志："
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.695" />
-
     <Button
         android:id="@+id/btn_stop"
         style="@style/Widget.AppCompat.Button"
@@ -191,23 +148,6 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.512" />
 
-    <EditText
-        android:id="@+id/log_output"
-        android:layout_width="match_parent"
-        android:layout_height="137dp"
-        android:layout_marginStart="4dp"
-        android:layout_marginLeft="4dp"
-        android:background="@drawable/log_shape"
-        android:focusable="false"
-        android:gravity="top"
-        android:inputType="textMultiLine"
-        android:scrollbars="vertical"
-        android:singleLine="false"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.954" />
-
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline"
         android:layout_width="wrap_content"
@@ -216,5 +156,4 @@
         app:layout_constraintGuide_percent="0.18" />
 
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/strings.xml

@@ -2,12 +2,15 @@
     <string name="app_name">GoProxy</string>
     <string name="title_home">主页</string>
     <string name="title_dashboard">关于</string>
-    <string name="args">运行参数</string>
+    <string name="args">一行一个服务的运行参数，多个服务写多行</string>
     <string name="ip_copied">IP已经复制</string>
     <string name="qqcopied">QQ群号码已复制</string>
-    <string name="apptitle">全能代理服务器</string>
+    <string name="apptitle">安卓全能代理服务器</string>
     <string name="hint0">由 snail007/goproxy SDK</string>
     <string name="hint1">强力驱动！</string>
     <string name="stopped">已停止</string>
     <string name="argsisempty">参数不能为空</string>
+    <string name="startfail">启动失败</string>
+    <string name="startok">启动成功</string>
+    <string name="stopdone">停止成功</string>
 </resources>