diff --git a/heygirl/src/main/res/values-night/themes.xml b/heygirl/src/main/res/values-night/themes.xml index 46bfc24..df342d3 100644 --- a/heygirl/src/main/res/values-night/themes.xml +++ b/heygirl/src/main/res/values-night/themes.xml @@ -58,6 +58,8 @@ false true + true + #aadcf5 diff --git a/heygirl/src/main/res/values/themes.xml b/heygirl/src/main/res/values/themes.xml index 7a8866e..9f7daae 100644 --- a/heygirl/src/main/res/values/themes.xml +++ b/heygirl/src/main/res/values/themes.xml @@ -60,6 +60,8 @@ false true + true + #aadcf5 diff --git a/tkgo/src/main/java/com/web/tkgo/MainActivity2.java b/tkgo/src/main/java/com/web/tkgo/MainActivity2.java index fc31ba0..a8baf9e 100644 --- a/tkgo/src/main/java/com/web/tkgo/MainActivity2.java +++ b/tkgo/src/main/java/com/web/tkgo/MainActivity2.java @@ -77,7 +77,7 @@ public class MainActivity2 extends AppCompatActivity { // public ImageView showTopV1; private LinearLayout showTopLy; private View topVvvv; - private ProgressBar progressBar; +// private ProgressBar progressBar; public static String url = "https://154.213.186.36"; //先定义 @@ -89,8 +89,8 @@ public class MainActivity2 extends AppCompatActivity { @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) @Override protected void onCreate(Bundle savedInstanceState) { - getWindow().setNavigationBarColor(Color.parseColor("#FFFFFF")); - getWindow().getDecorView().setBackgroundColor(Color.parseColor("#FFFFFF")); +// getWindow().setNavigationBarColor(Color.parseColor("#FFFFFF")); +// getWindow().getDecorView().setBackgroundColor(Color.parseColor("#FFFFFF")); getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_STABLE); super.onCreate(savedInstanceState); View decor = getWindow().getDecorView(); @@ -145,7 +145,7 @@ public class MainActivity2 extends AppCompatActivity { // showTopV1 = (ImageView) findViewById(R.id.show_top_v1); showTopLy = findViewById(R.id.show_top_ly); - progressBar = (ProgressBar) findViewById(R.id.progressbar); +// progressBar = (ProgressBar) findViewById(R.id.progressbar); tvErrorMsg = findViewById(R.id.errormsg); layoutError = findViewById(R.id.layoutError); WebSettings settings = webView.getSettings(); @@ -244,14 +244,14 @@ public class MainActivity2 extends AppCompatActivity { if (showTopLy.getVisibility() == View.VISIBLE) { handler.postDelayed(() ->{ showTopLy.setVisibility(View.GONE); + getWindow().getDecorView().setBackgroundColor(Color.parseColor("#FFFFFF")); + }, 500); } - if(webView.getUrl().equals(url+"/h5/")||webView.getUrl().equals(url+"/h5/#/")){ getWindow().setNavigationBarColor(Color.parseColor("#000000")); }else{ getWindow().setNavigationBarColor(Color.parseColor("#FFFFFF")); - } } @@ -283,7 +283,7 @@ public class MainActivity2 extends AppCompatActivity { onShowNetView(); } } - progressBar.setVisibility(View.GONE); +// progressBar.setVisibility(View.GONE); } @Override @@ -302,7 +302,7 @@ public class MainActivity2 extends AppCompatActivity { onShowNetView(); } } - progressBar.setVisibility(View.GONE); +// progressBar.setVisibility(View.GONE); } @@ -316,7 +316,7 @@ public class MainActivity2 extends AppCompatActivity { isAtGame = false; topVvvv.setVisibility(View.GONE); } else { - progressBar.setVisibility(View.VISIBLE); +// progressBar.setVisibility(View.VISIBLE); } if (!(url1.startsWith("http") || url1.startsWith("https"))) { try { @@ -362,7 +362,7 @@ public class MainActivity2 extends AppCompatActivity { isAtGame = false; topVvvv.setVisibility(View.GONE); } else { - progressBar.setVisibility(View.VISIBLE); +// progressBar.setVisibility(View.VISIBLE); } if (!(url1.startsWith("http") || url1.startsWith("https"))) { @@ -478,12 +478,12 @@ public class MainActivity2 extends AppCompatActivity { public void onProgressChanged(WebView view, int newProgress) { super.onProgressChanged(view, newProgress); // 更新进度条的进度 - progressBar.setProgress(newProgress); +// progressBar.setProgress(newProgress); // 如果加载完成,隐藏进度条 if (newProgress == 100) { - progressBar.setVisibility(View.GONE); +// progressBar.setVisibility(View.GONE); } else { - progressBar.setVisibility(View.VISIBLE); +// progressBar.setVisibility(View.VISIBLE); } } diff --git a/tkgo/src/main/res/layout/activity_main2.xml b/tkgo/src/main/res/layout/activity_main2.xml index 75217c4..b260c76 100644 --- a/tkgo/src/main/res/layout/activity_main2.xml +++ b/tkgo/src/main/res/layout/activity_main2.xml @@ -85,22 +85,22 @@ android:layout_below="@id/top_vvvv" android:orientation="vertical" android:gravity="center_horizontal" - android:background="@color/white" + android:background="@color/black" android:visibility="visible"> - @@ -108,20 +108,6 @@ - - - - - diff --git a/tkgo/src/main/res/mipmap-xxhdpi/tk_bg.jpg b/tkgo/src/main/res/mipmap-xxhdpi/tk_bg.jpg new file mode 100644 index 0000000..1d139f4 Binary files /dev/null and b/tkgo/src/main/res/mipmap-xxhdpi/tk_bg.jpg differ diff --git a/tkgo/src/main/res/values-night/themes.xml b/tkgo/src/main/res/values-night/themes.xml index 938757c..1c4dd2a 100644 --- a/tkgo/src/main/res/values-night/themes.xml +++ b/tkgo/src/main/res/values-night/themes.xml @@ -58,12 +58,14 @@ false true + true + - @color/white - + #000000 + - @color/white + #000000 false diff --git a/tkgo/src/main/res/values/themes.xml b/tkgo/src/main/res/values/themes.xml index 5f08031..b0307a5 100644 --- a/tkgo/src/main/res/values/themes.xml +++ b/tkgo/src/main/res/values/themes.xml @@ -60,11 +60,13 @@ false true + true + - #FFFFFF - - #FFFFFF + #000000 + + #000000 false