hg
/
JY-TVBoxOS
mirror of https://github.com/q215613905/TVBoxOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18 from Tangsan99999/revert-9-main

Browse Source 
Revert "增加片头片尾时间重置按钮"
pull/1/head
thanatos888 3 years ago committed by GitHub
parent f297ccd926 ee688ab69c
commit 0377c2de92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 2 additions and 82 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 36
      .idea/inspectionProfiles/Project_Default.xml
  2. 5
      .idea/misc.xml
  3. 10
      .idea/runConfigurations.xml
  4. 17
      app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java
  5. 1
      app/src/main/java/com/github/tvbox/osc/ui/dialog/ApiDialog.java
  6. 14
      app/src/main/res/layout/player_vod_control_view.xml
  7. 1
      app/src/main/res/values/strings.xml

36
.idea/inspectionProfiles/Project_Default.xml
Unescape View File

@ -1,36 +0,0 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="JavaDoc" enabled="true" level="WARNING" enabled_by_default="true">
<option name="TOP_LEVEL_CLASS_OPTIONS">
<value>
<option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
<option name="REQUIRED_TAGS" value="" />
</value>
</option>
<option name="INNER_CLASS_OPTIONS">
<value>
<option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
<option name="REQUIRED_TAGS" value="" />
</value>
</option>
<option name="METHOD_OPTIONS">
<value>
<option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
<option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
</value>
</option>
<option name="FIELD_OPTIONS">
<value>
<option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
<option name="REQUIRED_TAGS" value="" />
</value>
</option>
<option name="IGNORE_DEPRECATED" value="false" />
<option name="IGNORE_JAVADOC_PERIOD" value="true" />
<option name="IGNORE_DUPLICATED_THROWS" value="false" />
<option name="IGNORE_POINT_TO_ITSELF" value="false" />
<option name="myAdditionalJavadocTags" value="date" />
</inspection_tool>
</profile>
</component>

5
.idea/misc.xml
Unescape View File

@ -10,10 +10,7 @@
</option>
</component>
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="FrameworkDetectionExcludesConfiguration">
<file type="web" url="file://$PROJECT_DIR$" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

10
.idea/runConfigurations.xml
Unescape View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
</set>
</option>
</component>
</project>

17
app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java
Unescape View File

@ -37,7 +37,6 @@ import xyz.doikki.videoplayer.util.PlayerUtils;
import static xyz.doikki.videoplayer.util.PlayerUtils.stringForTime;
//视频播放页面控件
public class VodController extends BaseController {
public VodController(@NonNull @NotNull Context context) {
super(context);
@ -284,20 +283,6 @@ public class VodController extends BaseController {
}
}
});
// 增加播放页面片头片尾时间重置
findViewById(R.id.play_time_reset).setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
try {
mPlayerConfig.put("et", 0);
mPlayerConfig.put("st", 0);
updatePlayerCfgView();
listener.updatePlayerCfg();
} catch (JSONException e) {
e.printStackTrace();
}
}
});
mPlayerTimeStartBtn.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
@ -305,7 +290,6 @@ public class VodController extends BaseController {
int step = Hawk.get(HawkConfig.PLAY_TIME_STEP, 5);
int st = mPlayerConfig.getInt("st");
st += step;
//片头最大跳过时间10分钟
if (st > 60 * 10)
st = 0;
mPlayerConfig.put("st", st);
@ -323,7 +307,6 @@ public class VodController extends BaseController {
int step = Hawk.get(HawkConfig.PLAY_TIME_STEP, 5);
int et = mPlayerConfig.getInt("et");
et += step;
//片尾最大跳过时间10分钟
if (et > 60 * 10)
et = 0;
mPlayerConfig.put("et", et);

1
app/src/main/java/com/github/tvbox/osc/ui/dialog/ApiDialog.java
Unescape View File

@ -55,7 +55,6 @@ public class ApiDialog extends BaseDialog {
ivQRCode = findViewById(R.id.ivQRCode);
tvAddress = findViewById(R.id.tvAddress);
inputApi = findViewById(R.id.input);
//内置网络接口在此处添加
inputApi.setText(Hawk.get(HawkConfig.API_URL, ""));
findViewById(R.id.inputSubmit).setOnClickListener(new View.OnClickListener() {
@Override

14
app/src/main/res/layout/player_vod_control_view.xml
Unescape View File

@ -175,19 +175,7 @@
android:text="1S"
android:textColor="@android:color/white"
android:textSize="@dimen/ts_24" />
<!--添加片头片尾重置按钮-->
<TextView
android:id="@+id/play_time_reset"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/vs_5"
android:layout_marginRight="@dimen/vs_5"
android:background="@drawable/button_dialog_main"
android:focusable="true"
android:padding="@dimen/vs_10"
android:text="↺"
android:textColor="@android:color/white"
android:textSize="@dimen/ts_24" />
</LinearLayout>

1
app/src/main/res/values/strings.xml
Unescape View File

@ -1,4 +1,3 @@
<resources>
<!-- app名称 -->
<string name="app_name">TVBox</string>
</resources>
Write Preview
Loading…
Cancel
Save