diff --git a/numtable/build.properties b/numtable/build.properties index 7a48d647..9548f93b 100644 --- a/numtable/build.properties +++ b/numtable/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu Jul 24 00:58:40 GMT 2025 +#Thu Jul 24 02:10:57 GMT 2025 stageCount=1 libraryProject= baseVersion=15.1 publishVersion=15.1.0 -buildCount=8 +buildCount=21 baseBetaVersion=15.1.1 diff --git a/numtable/src/main/java/cc/winboll/studio/numtable/MainActivity.java b/numtable/src/main/java/cc/winboll/studio/numtable/MainActivity.java index 8f4f8036..013d454c 100644 --- a/numtable/src/main/java/cc/winboll/studio/numtable/MainActivity.java +++ b/numtable/src/main/java/cc/winboll/studio/numtable/MainActivity.java @@ -8,11 +8,13 @@ import android.os.Build; import android.os.Bundle; import android.view.View; import android.widget.Button; +import android.widget.RadioButton; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import cc.winboll.studio.libappbase.LogView; import cc.winboll.studio.numtable.R; import com.hjq.toast.ToastUtils; +import java.util.UUID; public class MainActivity extends AppCompatActivity { @@ -36,8 +38,27 @@ public class MainActivity extends AppCompatActivity { createDesktopShortcut(); } }); + + + ((RadioButton)findViewById(R.id.rb_right)).setChecked(true); + ((RadioButton)findViewById(R.id.rb_left)).setChecked(false); } + public void onDirectionClick(View view) { + switch (view.getId()) { + case R.id.rb_right: + { + ((RadioButton)findViewById(R.id.rb_left)).setChecked(false); + break; + } + case R.id.rb_left: + { + ((RadioButton)findViewById(R.id.rb_right)).setChecked(false); + break; + } + } + } + /** * 创建桌面快捷方式 */ @@ -51,19 +72,33 @@ public class MainActivity extends AppCompatActivity { // 2. 创建快捷方式的Intent Intent shortcutIntent = new Intent(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + // 生成随机UUID + UUID uuid = UUID.randomUUID(); + // 转换为字符串 + String uuidStr = uuid.toString(); // Android 8.0及以上：使用ShortcutManager ShortcutManager shortcutManager = getSystemService(ShortcutManager.class); if (shortcutManager.isRequestPinShortcutSupported()) { - // 创建快捷方式信息 - ShortcutInfo shortcutInfo = new ShortcutInfo.Builder(this, "unique_shortcut_id") // 唯一ID - .setShortLabel("应用快捷方式") // 短标签（显示在桌面） - .setLongLabel("我的应用快捷方式") // 长标签（长按显示） - .setIcon(Icon.createWithResource(this, R.mipmap.ic_launcher)) // 图标 - .setIntent(targetIntent) - .build(); - - // 发送创建请求 - shortcutManager.requestPinShortcut(shortcutInfo, null); + if (((RadioButton)findViewById(R.id.rb_right)).isChecked()) { + // 创建快捷方式信息 + ShortcutInfo shortcutInfo = new ShortcutInfo.Builder(this, uuidStr) // 唯一ID + .setShortLabel(">>") // 短标签（显示在桌面） + .setLongLabel("在右边 >>") // 长标签（长按显示） + .setIcon(Icon.createWithResource(this, R.drawable.ic_point_right)) // 图标 + .setIntent(targetIntent) + .build(); + // 发送创建请求 + shortcutManager.requestPinShortcut(shortcutInfo, null); + } else { + ShortcutInfo shortcutInfo = new ShortcutInfo.Builder(this, uuidStr) // 唯一ID + .setShortLabel("<<") // 短标签（显示在桌面） + .setLongLabel("在左边 <<") // 长标签（长按显示） + .setIcon(Icon.createWithResource(this, R.drawable.ic_point_left)) // 图标 + .setIntent(targetIntent) + .build(); + // 发送创建请求 + shortcutManager.requestPinShortcut(shortcutInfo, null); + } ToastUtils.show("已请求创建快捷方式"); } else { ToastUtils.show("当前设备不支持创建快捷方式"); diff --git a/numtable/src/main/res/drawable/ic_point_left.xml b/numtable/src/main/res/drawable/ic_point_left.xml new file mode 100644 index 00000000..4fd5a739 --- /dev/null +++ b/numtable/src/main/res/drawable/ic_point_left.xml @@ -0,0 +1,20 @@ + + + + diff --git a/numtable/src/main/res/drawable/ic_point_right.xml b/numtable/src/main/res/drawable/ic_point_right.xml new file mode 100644 index 00000000..ca6f6339 --- /dev/null +++ b/numtable/src/main/res/drawable/ic_point_right.xml @@ -0,0 +1,20 @@ + + + + diff --git a/numtable/src/main/res/layout/activity_main.xml b/numtable/src/main/res/layout/activity_main.xml index 1738a7c8..57985d8d 100644 --- a/numtable/src/main/res/layout/activity_main.xml +++ b/numtable/src/main/res/layout/activity_main.xml @@ -23,21 +23,42 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_weight="1.0" - android:gravity="bottom"> + android:layout_weight="1.0"> + android:gravity="right|center_vertical" + android:layout_gravity="center_vertical"> + + + + + + + +