diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/BaseActivity.java b/app/src/main/java/org/sifacai/vlcjellyfin/BaseActivity.java index 1eb3d6e..26e0c0f 100644 --- a/app/src/main/java/org/sifacai/vlcjellyfin/BaseActivity.java +++ b/app/src/main/java/org/sifacai/vlcjellyfin/BaseActivity.java @@ -14,6 +14,7 @@ import android.view.MenuItem; import android.view.View; import android.widget.FrameLayout; import android.widget.ImageView; +import android.widget.PopupMenu; import android.widget.Toast; import androidx.annotation.Nullable; @@ -23,6 +24,8 @@ public class BaseActivity extends AppCompatActivity implements CustomAdapt { public AppCompatActivity mAA = this; private ProgressDialog progressDialog; private ImageView activeBarBack; + private ImageView actionBarSetBtn; + private PopupMenu settingMenu; @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -49,12 +52,30 @@ public class BaseActivity extends AppCompatActivity implements CustomAdapt { startActivity(intent); } }); + + //actionBar设置菜单 + actionBarSetBtn = findViewById(R.id.actionBar_setBtn); + actionBarSetBtn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + settingMenu.show(); + } + }); + settingMenu = new PopupMenu(this,actionBarSetBtn); + settingMenu.getMenuInflater().inflate(R.menu.activebar_menu,settingMenu.getMenu()); + settingMenu.setOnMenuItemClickListener(actionBarSetBtnOnclick); } } - private void actionBarSetBtnOnclick(){ - - } + private PopupMenu.OnMenuItemClickListener actionBarSetBtnOnclick = new PopupMenu.OnMenuItemClickListener() { + @Override + public boolean onMenuItemClick(MenuItem menuItem) { + if(menuItem.getItemId() == R.id.activeBar_option_logout){ + logout(); + } + return true; + } + }; // @Override // public boolean onCreateOptionsMenu(@NonNull Menu menu) { diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/Config.java b/app/src/main/java/org/sifacai/vlcjellyfin/Config.java index 964f551..655a2f8 100644 --- a/app/src/main/java/org/sifacai/vlcjellyfin/Config.java +++ b/app/src/main/java/org/sifacai/vlcjellyfin/Config.java @@ -10,6 +10,8 @@ public class Config { private String PassWord = ""; private String SortBy = "DateCreated"; private String SortOrder = "Descending"; + private boolean HAACC; //硬解 + private boolean FORCE_HAACC; //强制硬解 public Config(Context context) { this.context = context; @@ -61,6 +63,24 @@ public class Config { saveConfigToSP("sortorder",sortOrder); } + public boolean isHAACC() { + return HAACC; + } + + public void setHAACC(boolean HAACC) { + this.HAACC = HAACC; + saveConfigToSP("HAACC",HAACC); + } + + public boolean isFORCE_HAACC() { + return FORCE_HAACC; + } + + public void setFORCE_HAACC(boolean FORCE_HAACC) { + this.FORCE_HAACC = FORCE_HAACC; + saveConfigToSP("FORCE_HAACC",FORCE_HAACC); + } + /** * 读取配置 */ @@ -71,6 +91,8 @@ public class Config { this.PassWord = sp.getString("password", ""); this.SortBy = sp.getString("sortby","DateCreated"); this.SortOrder = sp.getString("sortorder","Descending"); + this.HAACC = sp.getBoolean("HAACC",true); + this.FORCE_HAACC = sp.getBoolean("FORCE_HAACC",false); } /** @@ -80,7 +102,16 @@ public class Config { SharedPreferences sp = context.getSharedPreferences("Jellyfin", context.MODE_PRIVATE); SharedPreferences.Editor editor = sp.edit(); editor.putString(key, value); - editor.putString(key, value); + editor.commit(); + } + + /** + * 保存单项配置 + */ + public void saveConfigToSP(String key, boolean value) { + SharedPreferences sp = context.getSharedPreferences("Jellyfin", context.MODE_PRIVATE); + SharedPreferences.Editor editor = sp.edit(); + editor.putBoolean(key, value); editor.commit(); } diff --git a/app/src/main/res/menu/activebar_menu.xml b/app/src/main/res/menu/activebar_menu.xml index 4565f9a..e4f40f8 100644 --- a/app/src/main/res/menu/activebar_menu.xml +++ b/app/src/main/res/menu/activebar_menu.xml @@ -1,8 +1,20 @@
\ No newline at end of file diff --git a/app/src/main/res/menu/activebar_sort_menu.xml b/app/src/main/res/menu/activebar_sort_menu.xml deleted file mode 100644 index 0565963..0000000 --- a/app/src/main/res/menu/activebar_sort_menu.xml +++ /dev/null @@ -1,28 +0,0 @@ - - \ No newline at end of file