Răsfoiți Sursa

Apex Mobile
修复设置系统字体大小后,app 内文字显示不全的问题。
修改部分拼写

Ray Zhang 8 ani în urmă
părinte
comite
49bcd3e190

+ 2 - 1
Apex Mobile/app/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.usai.apex"
     android:versionCode="8"
-    android:versionName="A180308"> <!-- Copied from Google Maps Library/AndroidManifest.xml. -->
+    android:versionName="2.0."> <!-- Copied from Google Maps Library/AndroidManifest.xml. -->
     <uses-sdk
         android:minSdkVersion="14"
         android:targetSdkVersion="18" />
@@ -92,6 +92,7 @@
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     -->
     <application
+        android:persistent="true"
         android:name=".ApexTrackingApplication"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"

+ 0 - 1
Apex Mobile/app/src/main/java/com/usai/apex/AnnouncementActivity.java

@@ -128,7 +128,6 @@ public class AnnouncementActivity extends AppCompatActivity
 		TextView titleview = mActionBarView.findViewById(R.id.title);
 		titleview.setText(getIntent().getStringExtra("module_name"));
 		setTitle(getIntent().getStringExtra("module_name"));
-
 		ActionBar actionBar = getSupportActionBar();
 		actionBar.setCustomView(mActionBarView, lp);
 //		actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);

+ 52 - 0
Apex Mobile/app/src/main/java/com/usai/apex/ApexTrackingApplication.java

@@ -6,6 +6,8 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.os.SystemClock;
 import android.text.TextUtils;
 import android.util.Log;
@@ -49,6 +51,56 @@ public class ApexTrackingApplication extends Application
 		// TODO Auto-generated method stub
 		Log.d(TAG, "onCreate");
 		super.onCreate();
+
+
+//		registerActivityLifecycleCallbacks(new Application.ActivityLifecycleCallbacks() {
+//			@Override
+//			public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
+//
+//			}
+//
+//			@Override
+//			public void onActivityStarted(Activity activity) {
+//
+//			}
+//
+//			// ...
+//			@Override
+//			public void onActivityResumed(Activity activity) {
+////				if (isBackground) {
+////					isBackground = false;
+////					notifyForeground();
+////				}
+//			}
+//
+//			@Override
+//			public void onActivityPaused(Activity activity) {
+//
+//			}
+//
+//			@Override
+//			public void onActivityStopped(Activity activity) {
+//
+//			}
+//
+//			@Override
+//			public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
+//
+//			}
+//
+//			@Override
+//			public void onActivityDestroyed(Activity activity) {
+//
+//			}
+//			// ...
+//		});
+
+		// 加载系统默认设置,字体不随用户设置变化
+		Resources res = super.getResources();
+		Configuration config = new Configuration();
+		config.setToDefaults();
+		res.updateConfiguration(config, res.getDisplayMetrics());
+
 		instance = this;
 
 		SharedPreferences pref = ApexTrackingApplication.get_instance()

+ 7 - 0
Apex Mobile/app/src/main/java/com/usai/apex/mainframe/RootActivity.java

@@ -36,6 +36,7 @@ public class RootActivity extends AppCompatActivity {
 
 
     Menu actionbutton;
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         actionbutton = menu;
@@ -70,6 +71,12 @@ public class RootActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        if (!isTaskRoot()) {
+            finish();
+            return;
+        }
+
         setContentView(R.layout.activity_root);
 
         if (savedInstanceState != null) {

+ 1 - 1
Apex Mobile/app/src/main/res/menu/navi_login.xml

@@ -17,7 +17,7 @@
     <item
         android:id="@+id/item_tool"
         android:icon="@drawable/tab_tools"
-        android:title="Tool" />
+        android:title="Tools" />
     <item
         android:id="@+id/item_my"
         android:icon="@drawable/tab_my"

+ 2 - 2
Apex Mobile/app/src/main/res/values/strings.xml

@@ -10,7 +10,7 @@
     <string name="action_markallread">Mark all as read</string>
     <string name="action_forget_password">Forget password</string>
     <string name="action_pdf_save">Save</string>
-    <string name="action_pdf_send">Share</string>
+    <string name="action_pdf_send">Share With Someone</string>
     <string name="action_pdf_open">Open</string>
     <string name="action_custom_fields">Customize Fields</string>
     <string name="action_sign_in_register"><b>Login</b></string>
@@ -142,6 +142,6 @@
     <string name="about_support_key">Support:</string>
     <string name="about_support_value">usairedant@united-us.net</string>
     <string name="actoin_search_document">Search Document</string>
-    <string name="actoin_share_detail">Share Detail</string>
+    <string name="actoin_share_detail">Share With Someone</string>
 
 </resources>