Skip to content

Commit 53eef4f

Browse files
PowerExplorerPowerExplorer
committed
fix ReaderView
1 parent 37b5bb1 commit 53eef4f

31 files changed

Lines changed: 390 additions & 724 deletions

File tree

‎PowerFileExplorer/build.gradle‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ repositories {
5050
dirs 'libs'
5151
}
5252
}
53-
//search method \n\s*[^\s\*/\{\}\(\);]*\s*[^\s\{\}\(\);/]*\s*[^\s\{\}\(\);/]*\s*[^\s;/\{\}\(\)]+\s+[^\s\.;,/\(\)\{\}]+\s*\([^=!\|\(\)\{\};/]*\)\s*\{
53+
54+
// git clone -b fanplayer https://github.com/rockcarry/ffmpeg
55+
//search method \n\s*[^\s\*/\{\}\(\);]*\s*[^\s\{\}\(\);/]*\s*[^\s\{\}\(\);/]*\s*[^\s;/\{\}\(\)]+\s+[^\s\.;,/\(\)\{\}]+\s*\([^=!\|\(\)\{\};/]*\)\s*\{
5456
dependencies{
5557
compile fileTree(dir: 'libs', include: ['*.jar'])
5658

@@ -71,14 +73,10 @@ dependencies{
7173
//compile files('libs/httpmime-4.2.5.jar')
7274
//compile files('libs/pdfparse.jar')
7375

74-
compile 'com.android.support:support-annotations:24.1.1'
76+
//compile 'com.android.support:support-annotations:24.1.1'
7577
compile 'com.android.support:support-vector-drawable:24.1.1'
7678
compile 'com.android.support:animated-vector-drawable:24.1.1'
7779

78-
compile 'com.android.support:support-v4:24.1.1'
79-
compile 'com.android.support:appcompat-v7:24.1.1'
80-
//compile 'com.android.support:support-v13:24.1.1'
81-
8280
compile 'com.android.support:recyclerview-v7:24.1.1'
8381
compile 'com.android.support:design:24.1.1'
8482
compile 'com.android.support:cardview-v7:24.1.1'
@@ -87,9 +85,18 @@ dependencies{
8785
//compile 'com.android.support:palette-v7:24.1.1'
8886

8987
compile 'eu.chainfire:libsuperuser:1.0.0.+'
90-
compile 'com.afollestad.material-dialogs:core:0.9.2.3+'
88+
compile ('com.afollestad.material-dialogs:core:0.9.2.3') {
89+
transitive = false
90+
}
9191
compile 'com.cloudrail:cloudrail-si-android:2.18.0'
9292
compile 'com.google.android.exoplayer:exoplayer:r2.3.1'
93+
//compile ('org.florescu.android.rangeseekbar:rangeseekbar-library:0.3.0') {
94+
// transitive = false
95+
//}
96+
97+
//compile 'com.android.support:support-v13:24.1.1'
98+
compile 'com.android.support:appcompat-v7:24.1.1'
99+
compile 'com.android.support:support-v4:24.1.1'
93100

94101
//support-v4
95102
//compile 'com.android.support:support-compat:25.3.1'
@@ -127,7 +134,7 @@ dependencies{
127134

128135

129136

130-
137+
//
131138
//compile 'com.chauthai.swipereveallayout:swipe-reveal-layout:1.4.1'
132139
//compile 'com.daimajia.swipelayout:library:1.2.0+'
133140
//compile 'com.artifex.mupdf:fitz:1.19.+'
@@ -174,11 +181,11 @@ dependencies{
174181
//compile 'com.jarvanmo:exoplayerview:1.0.7'
175182
//compile 'com.afollestad:easyvideoplayer:0.3.0'
176183
//compile 'ch.acra:acra:4.9.2'
177-
//compile 'com.google.android.exoplayer:exoplayer-core:r2.5.1'
178-
//compile 'com.google.android.exoplayer:exoplayer-dash:r2.5.1'
179-
//compile 'com.google.android.exoplayer:exoplayer-ui:r2.5.1'
180-
//compile 'com.google.android.exoplayer:exoplayer-hls:r2.5.1'
181-
//compile 'com.google.android.exoplayer:exoplayer-smoothstreaming:r2.5.1'
184+
//compile 'com.google.android.exoplayer:exoplayer-core:2.7.3'
185+
//compile 'com.google.android.exoplayer:exoplayer-dash:2.7.3'
186+
//compile 'com.google.android.exoplayer:exoplayer-ui:2.7.3'
187+
//compile 'com.google.android.exoplayer:exoplayer-hls:2.7.3'
188+
//compile 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.7.3'
182189
//compile 'com.google.android.exoplayer:exoplayer:2.7.3'
183190
//compile 'com.google.android.exoplayer:extension-rtmp:2.7.3'
184191
//compile 'com.google.android.exoplayer:extension-okhttp:2.7.3'
@@ -488,8 +495,7 @@ android {
488495
shrinkResources false
489496
useProguard false
490497
zipAlignEnabled true
491-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard/proguard-project.pro',
492-
'proguard/proguard-google-play-services.pro'
498+
//proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard/proguard-project.pro', 'proguard/proguard-google-play-services.pro'
493499
}
494500

495501
release {

‎PowerFileExplorer/src/main/AndroidManifest.xml‎

Lines changed: 8 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@
44
package="net.gnu.explorer"
55
android:versionCode="2"
66
android:versionName="1.0.2"
7-
android:installLocation="auto"
87
>
98

10-
<!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
9+
<!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle
10+
android:installLocation="auto"
11+
android:testOnly="false"
12+
android:debuggable="true"
13+
-->
1114
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23"/>
1215

1316
<uses-permission android:name="android.permission.WRITE_SETTINGS"/>
@@ -71,8 +74,6 @@
7174
android:theme="@style/appCompatLight"
7275
android:hardwareAccelerated="true"
7376
android:largeHeap="true"
74-
android:testOnly="false"
75-
android:debuggable="true"
7677
android:configChanges="keyboardHidden|orientation|screenSize"
7778
>
7879

@@ -355,6 +356,7 @@
355356
<data android:scheme="package" />
356357
</intent-filter>
357358
</receiver>-->
359+
358360
<!--android:parentActivityName="chm.cblink.nb.chmreader.FileChooserActivity"
359361
android:screenOrientation="portrait"
360362
android:launchMode="singleTop"-->
@@ -373,18 +375,6 @@
373375
</intent-filter>
374376
</activity>
375377

376-
<!--activity android:name="net.gnu.explorer.ItemListActivity"
377-
android:theme="@style/appCompatLight"
378-
android:label="@string/app_name">
379-
380-
</activity-->
381-
382-
<activity android:name="net.gnu.explorer.MainActivity"
383-
android:theme="@style/appCompatLight"
384-
android:label="@string/app_name">
385-
386-
</activity>
387-
388378
<activity
389379
android:name="net.gnu.explorer.WebActivity"
390380
android:label="Web View"
@@ -464,33 +454,6 @@
464454

465455
</activity>
466456

467-
<!--<activity android:name="jp.sblo.pandora.jota.Main"
468-
android:label="Jota Text Editor"
469-
android:theme="@style/AppTheme"
470-
>
471-
472-
<intent-filter>
473-
<action android:name="android.intent.action.VIEW" />
474-
<category android:name="android.intent.category.DEFAULT" />
475-
<data android:scheme="file" />
476-
<data android:scheme="content" />
477-
<data android:mimeType="text/*"/>
478-
</intent-filter>
479-
480-
<intent-filter>
481-
<action android:name="android.intent.action.SEND" />
482-
<category android:name="android.intent.category.DEFAULT" />
483-
<data android:mimeType="text/*" />
484-
</intent-filter>
485-
486-
<! for SL4A >
487-
<intent-filter>
488-
<action android:name="com.googlecode.android_scripting.action.EDIT_SCRIPT" />
489-
<category android:name="android.intent.category.DEFAULT" />
490-
</intent-filter>
491-
492-
</activity>-->
493-
494457
<activity android:name="jp.sblo.pandora.jota.MainForResult"
495458
android:label="@string/app_name_debug"
496459
android:launchMode="standard">
@@ -533,19 +496,6 @@
533496
android:launchMode="singleTask"
534497
/>
535498

536-
<!--activity
537-
android:name="com.ghostsq.commander.PictureViewer"
538-
android:icon="@drawable/ic_action_eye_open"
539-
android:label="@string/pictvw_label"
540-
android:configChanges="orientation|keyboardHidden|screenSize"
541-
android:launchMode="singleTop">
542-
<intent-filter>
543-
<action android:name="android.intent.action.VIEW" />
544-
<category android:name="android.intent.category.DEFAULT" />
545-
<data android:mimeType="image/*" />
546-
</intent-filter>
547-
</activity-->
548-
549499
<activity
550500
android:name="net.gnu.explorer.PhotoActivity"
551501
android:icon="@drawable/ic_action_eye_open"
@@ -574,57 +524,7 @@
574524

575525
</activity>
576526

577-
<!--activity android:name="com.jarvanmo.demo.VideoActivity"
578-
android:label="Media Player"
579-
android:configChanges="keyboardHidden|orientation|screenSize"
580-
android:theme="@style/Theme.AppCompat.Light.NoActionBar"
581-
>
582-
<intent-filter>
583-
<action android:name="android.intent.action.VIEW" />
584-
<category android:name="android.intent.category.DEFAULT" />
585-
<data android:scheme="file" />
586-
<data android:scheme="content" />
587-
<data android:mimeType="video/*"/>
588-
<data android:mimeType="audio/*"/>
589-
</intent-filter>
590-
</activity-->
591-
592-
<!--activity
593-
android:name="com.afollestad.easyvideoplayersample.EasyMediaActivity"
594-
android:label="Easy Player"
595-
android:theme="@style/Theme.AppCompat.Light.NoActionBar"
596-
android:configChanges="orientation|keyboardHidden|screenLayout|screenSize">
597-
598-
<intent-filter>
599-
<action android:name="android.intent.action.VIEW" />
600-
<category android:name="android.intent.category.DEFAULT" />
601-
<data android:scheme="file" />
602-
<data android:scheme="content" />
603-
<data android:mimeType="video/*"/>
604-
<data android:mimeType="audio/*"/>
605-
</intent-filter>
606-
</activity-->
607-
608-
<!--activity android:name="com.google.android.exoplayer2.demo.SampleChooserActivity"
609-
android:configChanges="keyboardHidden"
610-
android:label="Playlist">
611-
<intent-filter>
612-
<action android:name="android.intent.action.VIEW"/>
613-
<category android:name="android.intent.category.DEFAULT"/>
614-
<category android:name="android.intent.category.BROWSABLE"/>
615-
<data android:scheme="http"/>
616-
<data android:scheme="https"/>
617-
<data android:scheme="content"/>
618-
<data android:scheme="asset"/>
619-
<data android:scheme="file"/>
620-
<data android:host="*"/>
621-
<data android:mimeType="video/*"/>
622-
<data android:mimeType="audio/*"/>
623-
<data android:pathPattern=".*\\.exolist\\.json"/>
624-
</intent-filter>
625-
</activity-->
626-
627-
<activity android:name="net.gnu.explorer.MediaPlayerActivity"
527+
<!--<activity android:name="net.gnu.explorer.PlayerActivity"
628528
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
629529
android:launchMode="singleTop"
630530
android:icon="@drawable/exo_banner"
@@ -635,19 +535,14 @@
635535
<action android:name="android.intent.action.VIEW" />
636536
<category android:name="android.intent.category.BROWSABLE"/>
637537
<category android:name="android.intent.category.DEFAULT"/>
638-
<!--data android:scheme="http"/>
639-
<data android:scheme="https"/>
640-
<data android:scheme="content"/>
641-
<data android:scheme="asset"/>
642-
<data android:scheme="file"/-->
643538
<data android:mimeType="video/*"/>
644539
<data android:mimeType="audio/*"/>
645540
</intent-filter>
646541
<intent-filter>
647542
<action android:name="com.google.android.exoplayer.demo.action.VIEW_LIST"/>
648543
<category android:name="android.intent.category.DEFAULT"/>
649544
</intent-filter>
650-
</activity>
545+
</activity>-->
651546

652547

653548

‎PowerFileExplorer/src/main/java/chm/cblink/nb/chmreader/CHMActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ protected Void doInBackground(Void... voids) {
531531
@Override
532532
protected void onProgressUpdate(Integer... values) {
533533
super.onProgressUpdate(values);
534-
searchProgress.setProgress(values[0]);
534+
searchProgress.setProgress(values[0].intValue());
535535
if (values[1] == 1) {
536536
searchResult.add(listSite.get(values[0]));
537537
adapter.notifyDataSetChanged();

‎PowerFileExplorer/src/main/java/chm/cblink/nb/chmreader/lib/CHMFile.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ private synchronized ListingEntry resolveIndexedEntry(String name, int chunkNo,
256256
int freeSpace = in.read32(); // Length of free space and/or quickref area at end of directory chunk
257257
// directory index entries, sorted by filename (case insensitive)
258258
while (in.available() > freeSpace) {
259-
index.put(in.readUTF8(in.readENC()), in.readENC());
259+
index.put(in.readUTF8(in.readENC()), Integer.valueOf(in.readENC()));
260260
}
261261
log.fine("Index L" + level + indexTree);
262262
}
@@ -273,7 +273,7 @@ private synchronized ListingEntry resolveIndexedEntry(String name, int chunkNo,
273273
break; // we found its chunk, break anyway
274274
}
275275
lastKey = item.getKey();
276-
chunkNo = item.getValue();
276+
chunkNo = item.getValue().intValue();
277277
}
278278
return resolveIndexedEntry(name, chunkNo, level + 1);
279279
} else { // process the listing chunk, and cache entries in the whole chunk
@@ -501,7 +501,7 @@ private void readBlock() throws IOException {
501501

502502
int cachedNo = blockNo / resetInterval;
503503
synchronized (cachedBlocks) {
504-
byte[][] cache = cachedBlocks.get(cachedNo);
504+
byte[][] cache = cachedBlocks.get(Integer.valueOf(cachedNo));
505505
if (cache == null) {
506506
if ((cache = cachedBlocks.prune()) == null) // try reuse old caches
507507
{
@@ -518,7 +518,7 @@ private void readBlock() throws IOException {
518518
createInputStream(sectionOffset + addressTable[blockNo], len),
519519
cache[i]); // here is the heart
520520
}
521-
cachedBlocks.put(cachedNo, cache);
521+
cachedBlocks.put(Integer.valueOf(cachedNo), cache);
522522
}
523523
if (buf == null) // allocate the buffer
524524
{
@@ -613,4 +613,4 @@ public static void main(String[] argv) throws Exception {
613613
}
614614
chm.close();
615615
}
616-
}
616+
}

0 commit comments

Comments
 (0)