Skip to content

Commit 9146497

Browse files
cheetah747cheetah747
committed
temp
1 parent c950916 commit 9146497

File tree

19 files changed

+574
-127
lines changed

19 files changed

+574
-127
lines changed

‎app/src/main/java/com/sibyl/HttpFileDominator/MyHttpServer.java‎

Lines changed: 45 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,10 @@ public class MyHttpServer extends Thread {
7171

7272
private static final ExecutorService threadPool = Executors.newCachedThreadPool();
7373
private static int port;
74-
private static ArrayList<UriInterpretation> fileUris = new ArrayList<>();
74+
private static ArrayList<UriInterpretation> fileUris = new ArrayList<>();//主列表
75+
private static ArrayList<UriInterpretation> clipboardUris = new ArrayList<>();
76+
private static ArrayList<UriInterpretation> normalUris = new ArrayList<>();
77+
7578
private static ServerSocket serverSocket = null;
7679
private static BaseActivity launcherActivity = null;
7780
private boolean webserverLoop = true;
@@ -86,6 +89,7 @@ public class MyHttpServer extends Thread {
8689

8790
// default port is 80
8891
public MyHttpServer(int listen_port){
92+
// fileUris = isClipboardMode? clipboardUris : normalUris;
8993
port = listen_port;
9094
if (serverSocket == null) {
9195
this.start();
@@ -96,16 +100,53 @@ public static void setBaseActivity(BaseActivity baseActivity){
96100
MyHttpServer.launcherActivity = baseActivity;
97101
}
98102

99-
public static void setFiles(ArrayList<UriInterpretation> fileUris) {
100-
MyHttpServer.fileUris = fileUris;
101-
}
103+
// public static void setFiles(ArrayList<UriInterpretation> fileUris) {
104+
// MyHttpServer.fileUris = fileUris;
105+
// }
106+
//
107+
// public static void setClipboardUris(ArrayList<UriInterpretation> clipboardUris) {
108+
// MyHttpServer.clipboardUris = clipboardUris;
109+
// }
102110

103111
public static ArrayList<UriInterpretation> GetFiles() {
104112
return MyHttpServer.fileUris;
105113
}
106114

115+
public static ArrayList<UriInterpretation> getNormalUris() {
116+
return normalUris;
117+
}
118+
119+
public static void setNormalUris(ArrayList<UriInterpretation> normalUris) {
120+
MyHttpServer.normalUris = normalUris;
121+
}
122+
123+
public static ArrayList<UriInterpretation> getClipboardUris() {
124+
return MyHttpServer.clipboardUris;
125+
}
126+
127+
public static void setClipboardUris(ArrayList<UriInterpretation> newUris){
128+
MyHttpServer.clipboardUris = newUris;
129+
}
130+
131+
/**根据类型来传uri们*/
132+
public static void addAllUrisByMode(boolean isClipboardMode, ArrayList<UriInterpretation> newUris) {
133+
if (isClipboardMode) {
134+
clipboardUris.addAll(newUris);
135+
fileUris = clipboardUris;
136+
} else {
137+
normalUris.addAll(newUris);
138+
fileUris = normalUris;
139+
}
140+
}
141+
142+
public static void changeUrisByMode(boolean isClipboardMode){
143+
fileUris = isClipboardMode? clipboardUris : normalUris;
144+
}
145+
107146
public static void clearFiles() {
108147
MyHttpServer.fileUris.clear();
148+
MyHttpServer.normalUris.clear();
149+
// MyHttpServer.clipboardUris.clear();
109150
}
110151

111152
public static String getLocalIpAddress() {

‎app/src/main/java/com/sibyl/HttpFileDominator/UriInterpretation.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,22 @@ public class UriInterpretation {
2929
private String path = null;
3030
private String mime;
3131
private boolean isDirectory = false;
32+
public boolean isClipboardType = false;
3233
private Uri uri;
3334
private ContentResolver contentResolver;
35+
public String clipboardText = "";
3436

3537
public InputStream getInputStream() throws FileNotFoundException {
3638
return contentResolver.openInputStream(uri);
3739
}
3840

41+
public UriInterpretation(Uri uri, String clipboardText, ContentResolver contentResolver) {
42+
this(uri,contentResolver);
43+
this.isClipboardType = true;
44+
this.clipboardText = clipboardText;
45+
}
46+
47+
3948
public UriInterpretation(Uri uri, ContentResolver contentResolver) {
4049
this.uri = uri;
4150

‎app/src/main/java/com/sibyl/HttpFileDominator/activities/BaseActivity.java‎

Lines changed: 34 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232

3333
import com.google.android.flexbox.FlexboxLayout;
3434
import com.google.android.material.floatingactionbutton.FloatingActionButton;
35-
import com.google.android.material.snackbar.Snackbar;
3635
import com.sibyl.HttpFileDominator.BuildConfig;
37-
import com.sibyl.HttpFileDominator.utils.DensityUtil;
38-
import com.sibyl.HttpFileDominator.views.DisplayRawFileFragment;
3936
import com.sibyl.HttpFileDominator.LoadWaitDominator;
4037
import com.sibyl.HttpFileDominator.MyHttpServer;
4138
import com.sibyl.HttpFileDominator.R;
4239
import com.sibyl.HttpFileDominator.UriInterpretation;
40+
import com.sibyl.HttpFileDominator.utils.DensityUtil;
41+
import com.sibyl.HttpFileDominator.utils.MySnackbarKt;
4342
import com.sibyl.HttpFileDominator.utils.ZxingCodeTool;
43+
import com.sibyl.HttpFileDominator.views.DisplayRawFileFragment;
4444

4545
import java.util.ArrayList;
4646

@@ -58,10 +58,11 @@ public class BaseActivity extends AppCompatActivity {
5858
protected FlexboxLayout fileNameContainer;
5959

6060
protected ImageButton qrcodeBtn;
61-
protected ImageButton shareBtn;
61+
// protected ImageButton clipboardBtn;
6262
protected ImageButton copyBtn;
6363

6464
protected FlexboxLayout flexboxLayout;
65+
protected FlexboxLayout clipboardLayout;
6566
protected LoadWaitDominator loadWait;
6667
// NavigationViews
6768
// protected View bttnQrCode;
@@ -94,11 +95,13 @@ public void handleMessage(Message inputMessage) {
9495
switch (inputMessage.what) {
9596
case HANDLER_CONNECTION_START:
9697
String msg = String.format(getString(R.string.connected_ip), (String) inputMessage.obj);
97-
Snackbar.make(findViewById(android.R.id.content), msg, Snackbar.LENGTH_LONG).show();
98+
// Snackbar.make(findViewById(android.R.id.content), msg, Snackbar.LENGTH_LONG).show();
99+
MySnackbarKt.show(findViewById(android.R.id.content),msg);
98100
break;
99101
case HANDLER_CONNECTION_END:
100102
String msg2 = String.format(getString(R.string.disconnected_ip), (String) inputMessage.obj);
101-
Snackbar.make(findViewById(android.R.id.content), msg2, Snackbar.LENGTH_LONG).show();
103+
// Snackbar.make(findViewById(android.R.id.content), msg2, Snackbar.LENGTH_LONG).show();
104+
MySnackbarKt.show(findViewById(android.R.id.content),msg2);
102105
break;
103106
default:
104107
super.handleMessage(inputMessage);
@@ -118,6 +121,7 @@ protected void setupTextViews() {
118121
loadWait = new LoadWaitDominator(this, (RelativeLayout) findViewById(R.id.containerLayout));
119122
link_msg = (TextView) findViewById(R.id.link_msg);
120123
fileNameContainer = (FlexboxLayout) findViewById(R.id.fileNameContainer);
124+
clipboardLayout = (FlexboxLayout) findViewById(R.id.clipboardContainer);
121125
// uriPath = (TextView) findViewById(R.id.uriPath);
122126
fab = (FloatingActionButton) findViewById(R.id.fab);
123127

@@ -129,7 +133,7 @@ protected void setupNavigationViews() {
129133
// share = findViewById(R.id.button_share_url);
130134
// changeIp = findViewById(R.id.change_ip);
131135
qrcodeBtn = findViewById(R.id.qrcodeBtn);
132-
shareBtn = findViewById(R.id.shareBtn);
136+
// clipboardBtn = findViewById(R.id.clipboardBtn);
133137
copyBtn = findViewById(R.id.copyBtn);
134138
flexboxLayout = findViewById(R.id.fileNameContainer);
135139
}
@@ -139,7 +143,8 @@ protected void createViewClickListener() {
139143
@Override
140144
public void onClick(View view) {
141145
if (TextUtils.isEmpty(link_msg.getText().toString())) {
142-
Snackbar.make(fab, getString(R.string.pls_add_first), Snackbar.LENGTH_LONG).show();
146+
// Snackbar.make(fab, getString(R.string.pls_add_first), Snackbar.LENGTH_LONG).show();
147+
MySnackbarKt.show(fab,getString(R.string.pls_add_first));
143148
return;
144149
}
145150
generateBarCodeIfPossible();
@@ -157,26 +162,27 @@ public void onClick(View view) {
157162
// Snackbar.make(findViewById(android.R.id.content), getString(R.string.now_sharing_anymore), Snackbar.LENGTH_SHORT).show();
158163
// }
159164
// });
160-
161-
shareBtn.setOnClickListener(new View.OnClickListener() {
162-
@Override
163-
public void onClick(View view) {
164-
if (TextUtils.isEmpty(link_msg.getText().toString())) {
165-
Snackbar.make(fab, getString(R.string.pls_add_first), Snackbar.LENGTH_LONG).show();
166-
return;
167-
}
168-
Intent i = new Intent(Intent.ACTION_SEND);
169-
i.setType("text/plain");
170-
i.putExtra(Intent.EXTRA_TEXT, preferredServerUrl);
171-
startActivity(Intent.createChooser(i, BaseActivity.this.getString(R.string.share_url)));
172-
}
173-
});
165+
//
166+
// shareBtn.setOnClickListener(new View.OnClickListener() {
167+
// @Override
168+
// public void onClick(View view) {
169+
// if (TextUtils.isEmpty(link_msg.getText().toString())) {
170+
// Snackbar.make(fab, getString(R.string.pls_add_first), Snackbar.LENGTH_LONG).show();
171+
// return;
172+
// }
173+
// Intent i = new Intent(Intent.ACTION_SEND);
174+
// i.setType("text/plain");
175+
// i.putExtra(Intent.EXTRA_TEXT, preferredServerUrl);
176+
// startActivity(Intent.createChooser(i, BaseActivity.this.getString(R.string.share_url)));
177+
// }
178+
// });
174179

175180
link_msg.setOnClickListener(new View.OnClickListener() {
176181
@Override
177182
public void onClick(View view) {
178183
if (TextUtils.isEmpty(link_msg.getText().toString())){
179-
Snackbar.make(fab, getString(R.string.pls_add_first), Snackbar.LENGTH_LONG).show();
184+
// Snackbar.make(fab, getString(R.string.pls_add_first), Snackbar.LENGTH_LONG).show();
185+
MySnackbarKt.show(fab,getString(R.string.pls_add_first));
180186
return;
181187
}
182188
createChangeIpDialog();
@@ -187,7 +193,8 @@ public void onClick(View view) {
187193
@Override
188194
public void onClick(View v) {
189195
if (TextUtils.isEmpty(link_msg.getText().toString())) {
190-
Snackbar.make(fab, getString(R.string.pls_add_first), Snackbar.LENGTH_LONG).show();
196+
// Snackbar.make(fab, getString(R.string.pls_add_first), Snackbar.LENGTH_LONG).show();
197+
MySnackbarKt.show(fab,getString(R.string.pls_add_first));
191198
return;
192199
}
193200
saveServerUrlToClipboard();
@@ -278,7 +285,9 @@ protected void saveServerUrlToClipboard() {
278285
ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
279286
clipboard.setPrimaryClip(ClipData.newPlainText(preferredServerUrl, preferredServerUrl));
280287

281-
Snackbar.make(fab, getString(R.string.url_clipboard), Snackbar.LENGTH_LONG).show();
288+
// Snackbar.make(fab, getString(R.string.url_clipboard), Snackbar.LENGTH_LONG).show();
289+
MySnackbarKt.show(fab,getString(R.string.url_clipboard));
290+
282291
// Snackbar.make(findViewById(android.R.id.content), getString(R.string.url_clipboard), Snackbar.LENGTH_LONG).show();
283292
}
284293

0 commit comments

Comments
 (0)