Skip to content

Commit 51c357a

Browse files
DziubaVLaDDziubaVLaD
committed
Delete WebView
1 parent fc27d92 commit 51c357a

22 files changed

+369
-349
lines changed

‎.idea/caches/build_file_checksums.ser

0 Bytes
Binary file not shown.

‎Your Master Cleaner.jks

2.2 KB
Binary file not shown.

‎app/app.iml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
9190
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
9291
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
9392
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />

‎app/build.gradle

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,18 @@ android.defaultConfig.javaCompileOptions.annotationProcessorOptions.includeCompi
33
android {
44
compileSdkVersion 27
55
buildToolsVersion '27.0.3'
6-
6+
lintOptions {
7+
checkReleaseBuilds false
8+
// Or, if you prefer, you can continue to check for errors in release builds,
9+
// but continue the build even when errors are found:
10+
abortOnError false
11+
}
712
defaultConfig {
813
applicationId "com.balaganovrocks.yourmastercleaner"
914
minSdkVersion 16
1015
targetSdkVersion 27
11-
versionCode 3
12-
versionName "1.0"
16+
versionCode 4
17+
versionName "1.1"
1318
}
1419
buildTypes {
1520
release {

‎app/release/output.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":4,"versionName":"1.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

‎app/src/main/java/com/balaganovrocks/yourmastercleaner/fragment/DeciveInfoFragment.java

Lines changed: 157 additions & 157 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import android.widget.ProgressBar;
1818

1919
import com.balaganovrocks.yourmastercleaner.base.BaseFragment;
20-
import com.balaganovrocks.yourmastercleaner.R;
20+
//import com.balaganovrocks.yourmastercleaner.R;
2121
import com.balaganovrocks.yourmastercleaner.base.BaseFragment;
2222

2323
import butterknife.ButterKnife;
@@ -26,160 +26,160 @@
2626

2727
public class DeciveInfoFragment extends BaseFragment {
2828

29-
@InjectView(R.id.webView)
30-
WebView mWebView;
31-
@InjectView(R.id.progress_bar)
32-
ProgressBar mProgressBar;
33-
Context mContext;
34-
@Override
35-
public View onCreateView(LayoutInflater inflater,
36-
@Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
37-
// TODO Auto-generated method stub
38-
39-
View view = inflater.inflate(R.layout.fragment_device_info, container, false);
40-
ButterKnife.inject(this, view);
41-
mContext = getActivity();
42-
43-
return view;
44-
}
45-
46-
47-
@Override
48-
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
49-
super.onViewCreated(view, savedInstanceState);
50-
51-
initWebview();
52-
}
53-
54-
private void fillData() {
55-
56-
}
57-
58-
59-
@Override
60-
public void onDestroyView() {
61-
super.onDestroyView();
62-
ButterKnife.reset(this);
63-
}
64-
private void initWebview() {
65-
// TODO Auto-generated method stub
66-
WebSettings webSettings = mWebView.getSettings();
67-
webSettings.setJavaScriptEnabled(true);
68-
// 设置可以访问文件
69-
webSettings.setAllowFileAccess(true);
70-
// 设置可以支持缩放
71-
webSettings.setSupportZoom(true);
72-
// 设置默认缩放方式尺寸是far
73-
webSettings.setDefaultZoom(WebSettings.ZoomDensity.MEDIUM);
74-
// 设置出现缩放工具
75-
webSettings.setBuiltInZoomControls(false);
76-
webSettings.setDefaultFontSize(20);
77-
78-
// 访问assets目录下的文件
79-
80-
mWebView.loadUrl("http://girl-atlas.com/");
81-
82-
// 设置WebViewClient
83-
mWebView.setWebViewClient(new WebViewClient() {
84-
// url拦截
85-
@Override
86-
public boolean shouldOverrideUrlLoading(WebView view, String url) {
87-
// 使用自己的WebView组件来响应Url加载事件，而不是使用默认浏览器器加载页面
88-
view.loadUrl(url);
89-
// 相应完成返回true
90-
return true;
91-
// return super.shouldOverrideUrlLoading(view, url);
92-
}
93-
94-
// 页面开始加载
95-
@Override
96-
public void onPageStarted(WebView view, String url, Bitmap favicon) {
97-
mProgressBar.setVisibility(View.VISIBLE);
98-
super.onPageStarted(view, url, favicon);
99-
}
100-
101-
// 页面加载完成
102-
@Override
103-
public void onPageFinished(WebView view, String url) {
104-
mProgressBar.setVisibility(View.GONE);
105-
super.onPageFinished(view, url);
106-
}
107-
108-
// WebView加载的所有资源url
109-
@Override
110-
public void onLoadResource(WebView view, String url) {
111-
super.onLoadResource(view, url);
112-
}
113-
114-
@Override
115-
public void onReceivedError(WebView view, int errorCode,
116-
String description, String failingUrl) {
117-
super.onReceivedError(view, errorCode, description, failingUrl);
118-
}
119-
120-
});
121-
122-
// 设置WebChromeClient
123-
mWebView.setWebChromeClient(new WebChromeClient() {
124-
@Override
125-
// 处理javascript中的alert
126-
public boolean onJsAlert(WebView view, String url, String message,
127-
final JsResult result) {
128-
return super.onJsAlert(view, url, message, result);
129-
};
130-
131-
@Override
132-
// 处理javascript中的confirm
133-
public boolean onJsConfirm(WebView view, String url,
134-
String message, final JsResult result) {
135-
return super.onJsConfirm(view, url, message, result);
136-
};
137-
138-
@Override
139-
// 处理javascript中的prompt
140-
public boolean onJsPrompt(WebView view, String url, String message,
141-
String defaultValue, final JsPromptResult result) {
142-
return super.onJsPrompt(view, url, message, defaultValue,
143-
result);
144-
};
145-
146-
// 设置网页加载的进度条
147-
@Override
148-
public void onProgressChanged(WebView view, int newProgress) {
149-
mProgressBar.setProgress(newProgress);
150-
super.onProgressChanged(view, newProgress);
151-
}
152-
153-
// 设置程序的Title
154-
@Override
155-
public void onReceivedTitle(WebView view, String title) {
156-
super.onReceivedTitle(view, title);
157-
}
158-
});
159-
mWebView.setOnKeyListener(new View.OnKeyListener() {
160-
@Override
161-
public boolean onKey(View v, int keyCode, KeyEvent event) {
162-
if (event.getAction() == KeyEvent.ACTION_DOWN) {
163-
if (keyCode == KeyEvent.KEYCODE_BACK
164-
&& mWebView.canGoBack()) { // 表示按返回键
165-
166-
mWebView.goBack(); // 后退
167-
168-
// webview.goForward();//前进
169-
return true; // 已处理
170-
}
171-
}
172-
return false;
173-
}
174-
});
175-
}
176-
177-
public boolean canBack() {
178-
if (mWebView.canGoBack()) {
179-
mWebView.goBack();
180-
return false;
181-
}
182-
return true;
183-
}
184-
29+
// @InjectView(R.id.webView)
30+
// WebView mWebView;
31+
// @InjectView(R.id.progress_bar)
32+
// ProgressBar mProgressBar;
33+
// Context mContext;
34+
// @Override
35+
// public View onCreateView(LayoutInflater inflater,
36+
// @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
37+
// // TODO Auto-generated method stub
38+
//
39+
// View view = inflater.inflate(R.layout.fragment_device_info, container, false);
40+
// ButterKnife.inject(this, view);
41+
// mContext = getActivity();
42+
//
43+
// return view;
44+
// }
45+
//
46+
//
47+
// @Override
48+
// public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
49+
// super.onViewCreated(view, savedInstanceState);
50+
//
51+
// initWebview();
52+
// }
53+
//
54+
// private void fillData() {
55+
//
56+
// }
57+
//
58+
//
59+
// @Override
60+
// public void onDestroyView() {
61+
// super.onDestroyView();
62+
// ButterKnife.reset(this);
63+
// }
64+
// private void initWebview() {
65+
// // TODO Auto-generated method stub
66+
// WebSettings webSettings = mWebView.getSettings();
67+
// webSettings.setJavaScriptEnabled(true);
68+
// // 设置可以访问文件
69+
// webSettings.setAllowFileAccess(true);
70+
// // 设置可以支持缩放
71+
// webSettings.setSupportZoom(true);
72+
// // 设置默认缩放方式尺寸是far
73+
// webSettings.setDefaultZoom(WebSettings.ZoomDensity.MEDIUM);
74+
// // 设置出现缩放工具
75+
// webSettings.setBuiltInZoomControls(false);
76+
// webSettings.setDefaultFontSize(20);
77+
//
78+
// // 访问assets目录下的文件
79+
//
80+
// mWebView.loadUrl("http://girl-atlas.com/");
81+
//
82+
// // 设置WebViewClient
83+
// mWebView.setWebViewClient(new WebViewClient() {
84+
// // url拦截
85+
// @Override
86+
// public boolean shouldOverrideUrlLoading(WebView view, String url) {
87+
// // 使用自己的WebView组件来响应Url加载事件，而不是使用默认浏览器器加载页面
88+
// view.loadUrl(url);
89+
// // 相应完成返回true
90+
// return true;
91+
// // return super.shouldOverrideUrlLoading(view, url);
92+
// }
93+
//
94+
// // 页面开始加载
95+
// @Override
96+
// public void onPageStarted(WebView view, String url, Bitmap favicon) {
97+
// mProgressBar.setVisibility(View.VISIBLE);
98+
// super.onPageStarted(view, url, favicon);
99+
// }
100+
//
101+
// // 页面加载完成
102+
// @Override
103+
// public void onPageFinished(WebView view, String url) {
104+
// mProgressBar.setVisibility(View.GONE);
105+
// super.onPageFinished(view, url);
106+
// }
107+
//
108+
// // WebView加载的所有资源url
109+
// @Override
110+
// public void onLoadResource(WebView view, String url) {
111+
// super.onLoadResource(view, url);
112+
// }
113+
//
114+
// @Override
115+
// public void onReceivedError(WebView view, int errorCode,
116+
// String description, String failingUrl) {
117+
// super.onReceivedError(view, errorCode, description, failingUrl);
118+
// }
119+
//
120+
// });
121+
//
122+
// // 设置WebChromeClient
123+
// mWebView.setWebChromeClient(new WebChromeClient() {
124+
// @Override
125+
// // 处理javascript中的alert
126+
// public boolean onJsAlert(WebView view, String url, String message,
127+
// final JsResult result) {
128+
// return super.onJsAlert(view, url, message, result);
129+
// };
130+
//
131+
// @Override
132+
// // 处理javascript中的confirm
133+
// public boolean onJsConfirm(WebView view, String url,
134+
// String message, final JsResult result) {
135+
// return super.onJsConfirm(view, url, message, result);
136+
// };
137+
//
138+
// @Override
139+
// // 处理javascript中的prompt
140+
// public boolean onJsPrompt(WebView view, String url, String message,
141+
// String defaultValue, final JsPromptResult result) {
142+
// return super.onJsPrompt(view, url, message, defaultValue,
143+
// result);
144+
// };
145+
//
146+
// // 设置网页加载的进度条
147+
// @Override
148+
// public void onProgressChanged(WebView view, int newProgress) {
149+
// mProgressBar.setProgress(newProgress);
150+
// super.onProgressChanged(view, newProgress);
151+
// }
152+
//
153+
// // 设置程序的Title
154+
// @Override
155+
// public void onReceivedTitle(WebView view, String title) {
156+
// super.onReceivedTitle(view, title);
157+
// }
158+
// });
159+
// mWebView.setOnKeyListener(new View.OnKeyListener() {
160+
// @Override
161+
// public boolean onKey(View v, int keyCode, KeyEvent event) {
162+
// if (event.getAction() == KeyEvent.ACTION_DOWN) {
163+
// if (keyCode == KeyEvent.KEYCODE_BACK
164+
// && mWebView.canGoBack()) { // 表示按返回键
165+
//
166+
// mWebView.goBack(); // 后退
167+
//
168+
// // webview.goForward();//前进
169+
// return true; // 已处理
170+
// }
171+
// }
172+
// return false;
173+
// }
174+
// });
175+
// }
176+
//
177+
// public boolean canBack() {
178+
// if (mWebView.canGoBack()) {
179+
// mWebView.goBack();
180+
// return false;
181+
// }
182+
// return true;
183+
// }
184+
//
185185
}

‎app/src/main/java/com/balaganovrocks/yourmastercleaner/fragment/MainFragment.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class MainFragment extends BaseFragment {
5757
ArcProgress arcProcess;
5858
@InjectView(R.id.capacity)
5959
TextView capacity;
60-
60+
Button Rubish_clean;
6161
Context mContext;
6262
Button BtnSettigs;
6363
private Timer timer;
@@ -72,7 +72,7 @@ public View onCreateView(LayoutInflater inflater,
7272

7373
View view = inflater.inflate(R.layout.fragment_main, container, false);
7474

75-
75+
Rubish_clean = (Button) view.findViewById(R.id.Rubish_clean);
7676
ButterKnife.inject(this, view);
7777
mContext = getActivity();
7878
BtnSettigs = (Button) view.findViewById(R.id.btnSettings);
@@ -85,6 +85,15 @@ public void onClick(View v)
8585
startActivityForResult(intent, 0); // do something
8686
}
8787
});
88+
Rubish_clean.setOnClickListener(new View.OnClickListener()
89+
{
90+
@Override
91+
public void onClick(View v)
92+
{
93+
Intent intent = new Intent(v.getContext(), RubbishCleanActivity.class);
94+
startActivityForResult(intent, 0); // do something
95+
}
96+
});
8897
return view;
8998

9099

0 commit comments

Comments
 (0)