最新一次版本提交

Mahkota8/google-services.json

@@ -1,13 +1,13 @@
 {
   "project_info": {
-    "project_number": "643424299568",
-    "project_id": "mahkota8-186da",
-    "storage_bucket": "mahkota8-186da.firebasestorage.app"
+    "project_number": "918799210650",
+    "project_id": "mahkota8-d3760",
+    "storage_bucket": "mahkota8-d3760.firebasestorage.app"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:643424299568:android:7ef0cd13dc9175bafb9bf5",
+        "mobilesdk_app_id": "1:918799210650:android:1b3d8d1288fb789c322723",
         "android_client_info": {
           "package_name": "com.web.MAHKOTA8"
         }
@@ -15,7 +15,7 @@
       "oauth_client": [],
       "api_key": [
         {
-          "current_key": "AIzaSyBuleiR8aPa6Dt3kevaK4wtSoYck31s8AU"
+          "current_key": "AIzaSyCMYRmt5pY4NpXQzZkaOIWODyyUw2AIO1Q"
         }
       ],
       "services": {

Mahkota8/src/main/java/com/web/MAHKOTA8/MainActivity2.java

@@ -10,6 +10,7 @@ import androidx.annotation.NonNull;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.messaging.FirebaseMessaging;
+import com.web.base.LogUtils;
 import com.web.base.MainActivity;
 
 public class MainActivity2 extends com.web.base.MainActivity2 {
@@ -20,20 +21,26 @@ public class MainActivity2 extends com.web.base.MainActivity2 {
         saveInt(MainActivity2.this,"user_code",userId);
         saveInt(MainActivity2.this,"version_code",getVersion());
         MainActivity.saveString(this, "base_url",    "https://www.mahkota8b.com/");
-
+        //网页的底部NavigationBar颜色
+        com.web.base.MainActivity.saveString(this, "style_color", "#f7db4b");
+        //页面的大背景颜色
+        com.web.base.MainActivity.saveString(this, "windows_color", "#f7db4b");
+        //任务栏的文字颜色 0 黑 1白 默认黑
+        saveInt(MainActivity2.this,"is_white",0);
         super.onCreate(savedInstanceState);
+        //用于修改大背景渐变色 不设置 大背景就是 windows_color 的颜色
+        setBackDrawables(R.drawable.big_bg);
+        setImageView(false);
         //订阅主题
         FirebaseMessaging.getInstance().subscribeToTopic("demo")
-                .addOnCompleteListener(new OnCompleteListener<Void>() {
-                    @Override
-                    public void onComplete(@NonNull Task<Void> task) {
-                        String msg = "Subscribed";
-                        if (!task.isSuccessful()) {
-                            msg = "Subscribe failed";
-                        }
-
+                .addOnCompleteListener(task -> {
+                    String msg = "Subscribed";
+                    if (!task.isSuccessful()) {
+                        msg = "Subscribe failed";
                     }
+                    LogUtils.i("结果："+msg);
                 });
+
     }
 
     public int getVersion(){

Mahkota8/src/main/res/drawable/big_bg.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:angle="270"
+        android:startColor="#f7db4b"
+        android:endColor="#f7db4b"/>
+</shape>

Mahkota8/src/main/res/values-en/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">MAHKOTA8</string>
+    <string name="app_name">Mahkota8</string>
     <string name="qsrlwmm_txt">Please Set Your Password</string>
     <string name="cancel_txt">Cancel</string>
     <string name="sure_txt">Sure</string>

Mahkota8/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">MAHKOTA8</string>
+    <string name="app_name">Mahkota8</string>
     <string name="qsrlwmm_txt">请输入6位密码</string>
     <string name="cancel_txt">取消</string>
     <string name="sure_txt">确定</string>