From 2ba2f88510d555753fbf29c5352028412a6721a0 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 4 Jun 2025 13:16:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B0=83=E8=AF=95=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appbase/build.properties | 4 +- libappbase/build.properties | 4 +- .../libappbase/activities/YunActivity.java | 41 ++++++++++++++++-- .../src/main/res/layout/activity_yun.xml | 42 ++++++++++++++++++- 4 files changed, 83 insertions(+), 8 deletions(-) diff --git a/appbase/build.properties b/appbase/build.properties index f332165..7bab6c3 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Jun 04 12:14:48 HKT 2025 +#Wed Jun 04 05:15:44 GMT 2025 stageCount=6 libraryProject=libappbase baseVersion=15.8 publishVersion=15.8.5 -buildCount=0 +buildCount=10 baseBetaVersion=15.8.6 diff --git a/libappbase/build.properties b/libappbase/build.properties index f332165..7bab6c3 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Jun 04 12:14:48 HKT 2025 +#Wed Jun 04 05:15:44 GMT 2025 stageCount=6 libraryProject=libappbase baseVersion=15.8 publishVersion=15.8.5 -buildCount=0 +buildCount=10 baseBetaVersion=15.8.6 diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/activities/YunActivity.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/activities/YunActivity.java index 5659042..c4e93e7 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/activities/YunActivity.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/activities/YunActivity.java @@ -11,6 +11,8 @@ import java.io.IOException; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; +import android.widget.RadioButton; +import cc.winboll.studio.libappbase.LogView; /** * @Author ZhanGSKen @@ -21,7 +23,13 @@ public class YunActivity extends Activity implements IWinBoLLActivity { public static final String TAG = "YunActivity"; - String mYunHost = ""; + public static final String DEBUG_HOST = "http://10.8.0.250:456"; + public static final String YUN_HOST = "https://yun.winboll.cc"; + + String mHost = ""; + RadioButton mrbYunHost; + RadioButton mrbDebugHost; + LogView mLogView; @Override public Activity getActivity() { @@ -37,7 +45,34 @@ public class YunActivity extends Activity implements IWinBoLLActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_yun); - mYunHost = BuildConfig.DEBUG ?"http://10.8.0.250:456": "https://yun.winboll.cc"; + mLogView = findViewById(R.id.logview); + mLogView.start(); + + mHost = BuildConfig.DEBUG ? DEBUG_HOST: YUN_HOST; + if (BuildConfig.DEBUG) { + mrbYunHost = findViewById(R.id.rb_yunhost); + mrbDebugHost = findViewById(R.id.rb_debughost); + mrbYunHost.setChecked(!BuildConfig.DEBUG); + mrbDebugHost.setChecked(BuildConfig.DEBUG); + } else { + findViewById(R.id.ll_hostbar).setVisibility(View.GONE); + } + } + + public void onSwitchHost(View view) { + if (view.getId() == R.id.rb_yunhost) { + mrbDebugHost.setChecked(false); + mHost = YUN_HOST; + } else if (view.getId() == R.id.rb_debughost) { + mrbYunHost.setChecked(false); + mHost = DEBUG_HOST; + } + } + + @Override + protected void onResume() { + super.onResume(); + mLogView.start(); } public void onTestYun(View view) { @@ -53,7 +88,7 @@ public class YunActivity extends Activity implements IWinBoLLActivity { void testYun() { OkHttpClient client = new OkHttpClient(); Request request = new Request.Builder() - .url(mYunHost + "/backups/") + .url(mHost + "/backups/") .build(); Response response = null; diff --git a/libappbase/src/main/res/layout/activity_yun.xml b/libappbase/src/main/res/layout/activity_yun.xml index 9d0a19b..ac73fab 100644 --- a/libappbase/src/main/res/layout/activity_yun.xml +++ b/libappbase/src/main/res/layout/activity_yun.xml @@ -9,7 +9,34 @@ + android:layout_height="wrap_content" + android:layout_gravity="right" + android:gravity="right" + android:padding="10dp" + android:id="@+id/ll_hostbar"> + + + + + + + +