liuzhenxing1118 2 vuotta sitten
vanhempi
sitoutus
74763ee5a0

+ 2 - 1
app/src/main/java/com/xplora/xponboarding/Activity/SimInstallActivity.java

@@ -6,6 +6,7 @@ import android.content.IntentFilter;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.Button;
 
 import com.xplora.xponboarding.R;
@@ -15,6 +16,7 @@ public class SimInstallActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
         setContentView(R.layout.activity_sim_install);
 
         initView();
@@ -22,7 +24,6 @@ public class SimInstallActivity extends BaseActivity {
     }
 
     private void initView() {
-        setWatchTitle(getString(R.string.sim_install));
         Button button = findViewById(R.id.button);
         button.setOnClickListener(new View.OnClickListener() {
             @Override

BIN
app/src/main/res/drawable-xhdpi/icon_sim.png


+ 33 - 8
app/src/main/res/layout/activity_sim_install.xml

@@ -9,6 +9,16 @@
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:fontFamily="Roboto"
+        android:visibility="gone"
+        />
+
+    <TextView
+        android:id="@+id/title1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="2dp"
+        android:layout_marginEnd="2dp"
         android:layout_marginTop="20dp"
         android:layout_centerHorizontal="true"
         android:textAlignment="center"
@@ -16,19 +26,34 @@
         android:textFontWeight="500"
         android:textColor="#FFFFFFFF"
         android:fontFamily="Roboto"
-        android:visibility="gone"
+        android:text="@string/sim_install_1"
         />
 
-    <ImageView
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:layout_below="@+id/title"
-        android:layout_marginBottom="5dp"
-        android:layout_marginTop="5dp"
+    <TextView
+        android:id="@+id/title2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="2dp"
+        android:layout_marginEnd="2dp"
+        android:layout_below="@+id/title1"
         android:layout_centerHorizontal="true"
-        android:background="@drawable/icon_sim"
+        android:textAlignment="center"
+        android:textSize="11sp"
+        android:textFontWeight="500"
+        android:textColor="#FFFFFFFF"
+        android:fontFamily="Roboto"
+        android:text="@string/sim_install_2"
         />
 
+    <ImageView
+        android:layout_width="135dp"
+        android:layout_height="90dp"
+        android:layout_below="@+id/title2"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="5dp"
+        android:background="@drawable/icon_sim" />
+
     <Button
         android:id="@+id/button"
         android:layout_width="80dp"

+ 2 - 0
app/src/main/res/values-b+sr+Latn/strings.xml

@@ -26,4 +26,6 @@
     <string name="restart">Pokreni ponovo</string>
     <string name="sim_input_error_3">Uneli ste pogrešan pin \n kod 3 putа, \n koristite telefon da otključate SIM karticu.</string>
     <string name="timeformat_hint">Ово је пример времена</string>
+    <string name="sim_install_1">"1. Prvo stavite SIM karticu  "</string>
+    <string name="sim_install_2">2. Zatim ponovo uključite sat</string>
 </resources>

+ 2 - 0
app/src/main/res/values-da/strings.xml

@@ -26,4 +26,6 @@
     <string name="restart">Genstart</string>
     <string name="sim_input_error_3">Du har indtastet forkert PIN-kode 3 gange, \n brug venligst din telefon til at låse SIM-kortet op.</string>
     <string name="timeformat_hint">Dette er et eksempel på tid</string>
+    <string name="sim_install_1">"1. Isæt simkortet først  "</string>
+    <string name="sim_install_2">2. Genstart derefter uret</string>
 </resources>

+ 2 - 0
app/src/main/res/values-de/strings.xml

@@ -26,4 +26,6 @@
     <string name="restart">Neu starten</string>
     <string name="sim_input_error_3">Du hast dreimal einen falschen PIN-Code \n eingegeben, \n bitte verwende dein Mobiltelefon, um die SIM-Karte zu entsperren.</string>
     <string name="timeformat_hint">Dies ist eine Beispielzeit</string>
+    <string name="sim_install_1">"1. Bitte installieren Sie zuerst die SIM-Karte  "</string>
+    <string name="sim_install_2">2. Starten Sie dann die Uhr neu</string>
 </resources>

+ 2 - 0
app/src/main/res/values-es/strings.xml

@@ -26,4 +26,6 @@
     <string name="restart">Reiniciar</string>
     <string name="sim_input_error_3">Has introducido un código PIN incorrecto \n 3 veces, \n usa tu teléfono para desbloquear la tarjeta SIM.</string>
     <string name="timeformat_hint">Este es un ejemplo de tiempo</string>
+    <string name="sim_install_1">"1. Primero, instala la tarjeta SIM  "</string>
+    <string name="sim_install_2">2. A continuación, reinicia el reloj</string>
 </resources>

+ 2 - 0
app/src/main/res/values-et/strings.xml

@@ -26,4 +26,6 @@
     <string name="restart">Taaskäivita</string>
     <string name="sim_input_error_3">Sisestasite 3 korda vale PIN-koodi \n, \n kasutage SIM-kaardi avamiseks oma telefoni.</string>
     <string name="timeformat_hint">See on näidisaeg</string>
+    <string name="sim_install_1">"1. Kõigepealt paigalda SIM-kaart  "</string>
+    <string name="sim_install_2">"2. Seejärel taaskäivita kell "</string>
 </resources>

+ 2 - 0
app/src/main/res/values-fi/strings.xml

@@ -26,4 +26,6 @@
     <string name="restart">Uudelleenkäynnistä</string>
     <string name="sim_input_error_3">Olet syöttänyt väärän PIN-koodin \n-koodin 3 kertaa, \n käytä puhelintasi SIM-kortin lukituksen avaamiseen.</string>
     <string name="timeformat_hint">Tämä on esimerkkiaika</string>
+    <string name="sim_install_1">"1. Asenna SIM-kortti ensin.  "</string>
+    <string name="sim_install_2">2. Käynnistä sitten kello uudelleen.</string>
 </resources>

+ 2 - 0
app/src/main/res/values-fr/strings.xml

@@ -26,4 +26,6 @@
     <string name="restart">Redémarrer</string>
     <string name="sim_input_error_3">Vous avez entré un mauvais code PIN 3 fois, \n veuillez utiliser votre téléphone pour déverrouiller la carte SIM.</string>
     <string name="timeformat_hint">Ceci est un exemple de temps</string>
+    <string name="sim_install_1">"1. Veuillez d'abord installer la carte SIM  "</string>
+    <string name="sim_install_2">2. Ensuite, redémarrez la montre</string>
 </resources>

+ 2 - 0
app/src/main/res/values-hu/strings.xml

@@ -26,4 +26,6 @@
     <string name="restart">Újrakezd</string>
     <string name="sim_input_error_3">Háromszor rossz PIN kódot\nadtál meg.\nKérjük, használja a telefonját a SIM-kártya feloldásához.</string>
     <string name="timeformat_hint">Ez egy példa alkalom</string>
+    <string name="sim_install_1">"1. Először telepítse a SIM-kártyát  "</string>
+    <string name="sim_install_2">2. Ezután indítsa újra az órát</string>
 </resources>

+ 2 - 0
app/src/main/res/values-is/strings.xml

@@ -26,4 +26,6 @@
     <string name="restart">Endurræsa</string>
     <string name="sim_input_error_3">Þú hefur slegið inn rangan PIN-númer \n 3 sinnum, \n vinsamlegast notaðu símann þinn til að opna SIM-kortið.</string>
     <string name="timeformat_hint">Þetta er dæmi um tíma</string>
+    <string name="sim_install_1">"1. Byrjaðu á því að setja upp SIM-kort  "</string>
+    <string name="sim_install_2">2. Endurræstu síðan úrið</string>
 </resources>

+ 2 - 0
app/src/main/res/values-it/strings.xml

@@ -26,4 +26,6 @@
     <string name="restart">Ricomincia</string>
     <string name="sim_input_error_3">Hai inserito il codice PIN errato per 3 volte, \n utilizza il telefono per sbloccare la scheda SIM.</string>
     <string name="timeformat_hint">Questo è un tempo di esempio</string>
+    <string name="sim_install_1">"1. Installare prima la scheda SIM  "</string>
+    <string name="sim_install_2">2. Quindi riavviare l\'orologio</string>
 </resources>

+ 2 - 0
app/src/main/res/values-nb/strings.xml

@@ -26,4 +26,6 @@
     <string name="restart">Omstart</string>
     <string name="sim_input_error_3">Du har skrevet inn feil PIN-kode 3 ganger, \n vennligst bruk telefonen til å låse opp SIM-kortet.</string>
     <string name="timeformat_hint">Dette er et eksempel på tid</string>
+    <string name="sim_install_1">"1. Installer SIM-kortet først  "</string>
+    <string name="sim_install_2">2. Start deretter klokken på nytt</string>
 </resources>

+ 2 - 0
app/src/main/res/values-nl/strings.xml

@@ -26,4 +26,6 @@
     <string name="restart">Herstarten</string>
     <string name="sim_input_error_3">Je hebt 3 keer een verkeerde pincode ingevoerd. \n Gebruik je telefoon om de SIM-kaart te ontgrendelen.</string>
     <string name="timeformat_hint">Dit is een voorbeeldtijd</string>
+    <string name="sim_install_1">"1. Installeer eerst de SIM-kaart  "</string>
+    <string name="sim_install_2">2. Start het horloge vervolgens opnieuw op</string>
 </resources>

+ 2 - 0
app/src/main/res/values-pt/strings.xml

@@ -26,4 +26,6 @@
     <string name="restart">Reiniciar</string>
     <string name="sim_input_error_3">Você digitou o código PIN errado 3 vezes, \n use seu telefone para desbloquear o cartão SIM.</string>
     <string name="timeformat_hint">Este é um exemplo de tempo</string>
+    <string name="sim_install_1">"1. Primeiro, insira o cartão SIM  "</string>
+    <string name="sim_install_2">2. Em seguida, reinicie o relógio</string>
 </resources>

+ 2 - 0
app/src/main/res/values-sl/strings.xml

@@ -26,4 +26,6 @@
     <string name="restart">Ponovni zagon</string>
     <string name="sim_input_error_3">3-krat ste vnesli napačno kodo \n PIN, \n uporabite telefon za odklepanje kartice SIM.</string>
     <string name="timeformat_hint">To je primer časa</string>
+    <string name="sim_install_1">"1. Najprej namestite kartico SIM  "</string>
+    <string name="sim_install_2">2. Nato znova zaženite uro</string>
 </resources>

+ 2 - 0
app/src/main/res/values-sv/strings.xml

@@ -26,4 +26,6 @@
     <string name="restart">Omstart</string>
     <string name="sim_input_error_3">Du har angett fel pinkod \n 3 gånger, \n använd din telefon för att låsa upp SIM-kortet.</string>
     <string name="timeformat_hint">Detta är en exempeltid</string>
+    <string name="sim_install_1">"1. Installera SIM-kortet först  "</string>
+    <string name="sim_install_2">2. Starta sedan om klockan</string>
 </resources>

+ 3 - 0
app/src/main/res/values/strings.xml

@@ -33,4 +33,7 @@
     <string name="restart">Restart</string>
     <string name="sim_input_error_3">You\'ve input wrong PIN \n 3 times \n Please use your phone to unlock the SIM card</string>
     <string name="timeformat_hint">This is an example time</string>
+
+    <string name="sim_install_1">1.Please install SIM card first</string>
+    <string name="sim_install_2">2.Then restart the watch</string>
 </resources>