diff --git a/README.md b/README.md index b6b0877..5a6d024 100644 --- a/README.md +++ b/README.md @@ -22,4 +22,4 @@ Android 4.0.3 及以上版本均可使用。 ## 联系 -有问题欢迎进群反馈,官方QQ群:42805407。 \ No newline at end of file +有问题欢迎进群反馈,官方QQ群:793015219。 \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 617af55..7d787b9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,7 @@ + @@ -15,7 +16,8 @@ android:theme="@style/AppTheme"> + android:label="@string/app_name" + android:screenOrientation="portrait"> @@ -23,14 +25,14 @@ - - - - - - - - + + + + + + + + diff --git a/app/src/main/java/com/host900/goproxy/MainActivity.java b/app/src/main/java/com/host900/goproxy/MainActivity.java index 0dd774d..a88bd06 100644 --- a/app/src/main/java/com/host900/goproxy/MainActivity.java +++ b/app/src/main/java/com/host900/goproxy/MainActivity.java @@ -35,6 +35,7 @@ import snail007.proxysdk.Proxysdk; public class MainActivity extends AppCompatActivity { + String TAG = "HomeFragment"; String serviceID = "srv"; int log_line_cnt = 0; @@ -77,7 +78,7 @@ public class MainActivity extends AppCompatActivity { ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE); ClipData mClipData = ClipData.newPlainText("ip", ((TextView)view).getText()); cm.setPrimaryClip(mClipData); - Toast.makeText(view.getContext(), "IP已经复制", Toast.LENGTH_LONG).show(); + Toast.makeText(view.getContext(), R.string.ip_copied, Toast.LENGTH_LONG).show(); return false; } }); @@ -87,7 +88,7 @@ public class MainActivity extends AppCompatActivity { ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE); ClipData mClipData = ClipData.newPlainText("qq", ((TextView)view).getText()); cm.setPrimaryClip(mClipData); - Toast.makeText(view.getContext(), "QQ群号码已复制", Toast.LENGTH_LONG).show(); + Toast.makeText(view.getContext(), R.string.qqcopied, Toast.LENGTH_LONG).show(); return false; } }); @@ -95,8 +96,8 @@ public class MainActivity extends AppCompatActivity { viewManual.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG); //下划线 viewManual.getPaint().setAntiAlias(true);//抗锯齿 - getSupportActionBar().setTitle("全能代理服务器"); - tip.setText("由 snail007/goproxy SDK " + sdkVersion + " 强力驱动!"); + getSupportActionBar().setTitle(getString(R.string.apptitle)); + tip.setText(getString(R.string.hint0) + sdkVersion + getString(R.string.hint1)); ipaddrs.setText(getIpAddress(getBaseContext())); joinQQ.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG); //下划线 @@ -119,7 +120,7 @@ public class MainActivity extends AppCompatActivity { public void onClick(View view) { Proxysdk.stop((serviceID)); editText.setEnabled(true); - status.setText("已停止"); + status.setText(R.string.stopped); } }; } @@ -134,7 +135,7 @@ public class MainActivity extends AppCompatActivity { args = args.substring(5); } if (args.replaceAll("\n","").length() == 0) { - Toast.makeText(ctx, "参数不能为空", Toast.LENGTH_LONG).show(); + Toast.makeText(ctx, R.string.argsisempty, Toast.LENGTH_LONG).show(); return; } String err = Proxysdk.startWithLog(serviceID, args, "", new LogCallback() { @@ -150,7 +151,8 @@ public class MainActivity extends AppCompatActivity { }); if (!err.isEmpty()) { Toast.makeText(ctx, err, Toast.LENGTH_LONG).show(); - // Log.d(TAG, err); +// Log.d(TAG, err); + } else { editText.setEnabled(false); status.setText("运行中"); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 79a9892..1dc9f44 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -50,7 +50,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:autoLink="none" - android:text="42805407" + android:text="793015219" android:textColor="#F00" android:textStyle="bold" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a2ed2e3..b192cd1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,4 +3,11 @@ 主页 关于 运行参数 + IP已经复制 + QQ群号码已复制 + 全能代理服务器 + 由 snail007/goproxy SDK + 强力驱动! + 已停止 + 参数不能为空 diff --git a/settings.gradle b/settings.gradle index eaa2a43..a9b9dfe 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ include ':app' -rootProject.name='goproxy服务器版' +rootProject.name='goproxy'