Commit 52f1248a authored by wanglei's avatar wanglei

...

parent 7ae255cd
...@@ -282,7 +282,9 @@ class LocationMapActivity : BaseActivity<ActivityLocationMapBinding>(), OnMapRea ...@@ -282,7 +282,9 @@ class LocationMapActivity : BaseActivity<ActivityLocationMapBinding>(), OnMapRea
} }
} }
locationPresenter.refreshLocationCallBack = { locationPresenter.refreshLocationCallBack = {
toast("updata ${it?.latitude} ${it?.longitude}") if (BuildConfig.DEBUG) {
toast("updata ${it?.latitude} ${it?.longitude}")
}
LogEx.logDebug(TAG, "myLocation ${it}") LogEx.logDebug(TAG, "myLocation ${it}")
changeMyLocation(it, false, false, false) changeMyLocation(it, false, false, false)
} }
......
...@@ -18,7 +18,6 @@ import com.base.locationsharewhite.ui.howuse.HowUseActivity ...@@ -18,7 +18,6 @@ import com.base.locationsharewhite.ui.howuse.HowUseActivity
import com.base.locationsharewhite.ui.main.LocationCodeActivity import com.base.locationsharewhite.ui.main.LocationCodeActivity
import com.base.locationsharewhite.ui.main.LocationShareActivity import com.base.locationsharewhite.ui.main.LocationShareActivity
import com.base.locationsharewhite.ui.main.MainActivity import com.base.locationsharewhite.ui.main.MainActivity
import com.base.locationsharewhite.ui.set.LanguageActivity
import com.base.locationsharewhite.ui.set.SettingActivity import com.base.locationsharewhite.ui.set.SettingActivity
import com.base.locationsharewhite.utils.BarUtils import com.base.locationsharewhite.utils.BarUtils
import com.base.locationsharewhite.utils.LogEx import com.base.locationsharewhite.utils.LogEx
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<stroke <stroke
android:width="1dp" android:width="1dp"
android:color="#03B988" android:color="#3C93E2"
android:dashWidth="5dp" android:dashWidth="5dp"
android:dashGap="5dp" /> android:dashGap="5dp" />
<solid android:color="#EDF6FD" /> <solid android:color="#EDF6FD" />
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/white" /> <item android:drawable="@color/white" />
<item android:gravity="top|end">
<bitmap android:src="@mipmap/bg_splash" />
</item>
<item <item
android:gravity="top|center_horizontal" android:gravity="top|center_horizontal"
android:top="225dp"> android:top="225dp">
<bitmap android:src="@mipmap/qdylogo" /> <bitmap android:src="@mipmap/qdylogo" />
</item> </item>
</layer-list> </layer-list>
\ No newline at end of file
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:text="@string/app_name" android:text="@string/app_name_short"
android:textColor="#222222" android:textColor="#222222"
android:textSize="22sp" android:textSize="22sp"
android:textStyle="bold" android:textStyle="bold"
......
...@@ -99,7 +99,8 @@ ...@@ -99,7 +99,8 @@
android:layout_marginTop="18dp" android:layout_marginTop="18dp"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:clickable="true" android:clickable="true"
android:focusable="true"> android:focusable="true"
android:visibility="gone">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
android:background="@drawable/splash_bp" android:background="@drawable/splash_bp"
tools:context=".ui.splash.SplashActivity"> tools:context=".ui.splash.SplashActivity">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -24,7 +25,7 @@ ...@@ -24,7 +25,7 @@
android:layout_marginBottom="21dp" android:layout_marginBottom="21dp"
android:text="@string/app_name" android:text="@string/app_name"
android:textColor="#001725" android:textColor="#001725"
android:textSize="22sp" android:textSize="18sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/tv_tip" app:layout_constraintBottom_toTopOf="@id/tv_tip"
app:layout_constraintEnd_toEndOf="@id/progressbar" app:layout_constraintEnd_toEndOf="@id/progressbar"
...@@ -35,12 +36,12 @@ ...@@ -35,12 +36,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="21dp" android:layout_marginBottom="21dp"
tools:text="@string/moment_please_s"
android:textColor="#848484" android:textColor="#848484"
android:textSize="15sp" android:textSize="15sp"
app:layout_constraintBottom_toTopOf="@id/progressbar" app:layout_constraintBottom_toTopOf="@id/progressbar"
app:layout_constraintEnd_toEndOf="@id/progressbar" app:layout_constraintEnd_toEndOf="@id/progressbar"
app:layout_constraintStart_toStartOf="@id/progressbar" /> app:layout_constraintStart_toStartOf="@id/progressbar"
tools:text="@string/moment_please_s" />
<ProgressBar <ProgressBar
android:id="@+id/progressbar" android:id="@+id/progressbar"
......
<resources> <resources>
<string name="app_name">Live Location Share</string> <string name="app_name">Phone Tracker : Family Location</string>
<string name="app_name_short">Phone Tracker</string>
<string name="moment_please_s">moment please…%1$d%%</string> <string name="moment_please_s">moment please…%1$d%%</string>
<string name="friend_location_map">Friend Location Map</string> <string name="friend_location_map">Friend Location Map</string>
<string name="view_friend_locations_on_the_map">View friend locations on the map</string> <string name="view_friend_locations_on_the_map">View friend locations on the map</string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment