release ICL02Launcher V149

给H88 添加控制自由锻炼的界面

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d291b3d..e04498a 100644 (file)
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
-        </compositeConfiguration>
+        <option name="delegatedBuild" value="true" />
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="testRunner" value="PLATFORM" />
       </GradleProjectSettings>
     </option>
   </component>

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644 (file)
index 0000000..17c8136
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project version="4">\r
+  <component name="RemoteRepositoriesConfiguration">\r
+    <remote-repository>\r
+      <option name="id" value="central" />\r
+      <option name="name" value="Maven Central repository" />\r
+      <option name="url" value="https://repo1.maven.org/maven2" />\r
+    </remote-repository>\r
+    <remote-repository>\r
+      <option name="id" value="jboss.community" />\r
+      <option name="name" value="JBoss Community repository" />\r
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />\r
+    </remote-repository>\r
+    <remote-repository>\r
+      <option name="id" value="BintrayJCenter" />\r
+      <option name="name" value="BintrayJCenter" />\r
+      <option name="url" value="https://jcenter.bintray.com/" />\r
+    </remote-repository>\r
+    <remote-repository>\r
+      <option name="id" value="Google" />\r
+      <option name="name" value="Google" />\r
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />\r
+    </remote-repository>\r
+  </component>\r
+</project>
\ No newline at end of file

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 687d49e..cecba62 100644 (file)
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -39,7 +39,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

diff --git a/app/release/ICL02Launcher_V148_202009082009_release.apk b/app/release/ICL02Launcher_V148_202009082009_release.apk
deleted file mode 100644 (file)
index ec1af64..0000000
Binary files a/app/release/ICL02Launcher_V148_202009082009_release.apk and /dev/null differ

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d927c03..c4ed244 100644 (file)
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,6 +23,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name=".AnimalHeatActivity"/>
+        <activity android:name=".PractiseActivity"/>
         <activity android:name=".SelectDialActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/app/src/main/java/com/ic/launcher/QrCodeActivity.java b/app/src/main/java/com/ic/launcher/QrCodeActivity.java
index ce50ff4..ae39029 100644 (file)
--- a/app/src/main/java/com/ic/launcher/QrCodeActivity.java
+++ b/app/src/main/java/com/ic/launcher/QrCodeActivity.java
@@ -30,7 +30,7 @@ import com.ic.launcher.util.QRCodeUtil;
 public class QrCodeActivity extends AppCompatActivity implements
         MainClockGestureDetectorImpl.OnClockGestureFlingListener {
 
-    final static String KeyIMEI = "IMEI";
+    final static String KeyIMEI = "persist.sys.protocol_IMEI";
     private GestureDetectorCompat gesture;
 
     @Override
@@ -39,8 +39,8 @@ public class QrCodeActivity extends AppCompatActivity implements
         ActivityQrCodeBinding qrCodeBinding = ActivityQrCodeBinding.inflate(getLayoutInflater());
         setContentView(qrCodeBinding.getRoot());
 
-        String imei = getPrefStringPublic(this, KeyIMEI, null);
-        if (TextUtils.isEmpty(imei)) {
+        String imei = getPrefStringPublic(this, KeyIMEI, "");
+        if (TextUtils.isEmpty(imei.trim())) {
             imei = GetIMEI();
         }
         if (TextUtils.isEmpty(imei)) {

diff --git a/app/src/main/java/com/ic/launcher/configure/l02/L02AppInfo.java b/app/src/main/java/com/ic/launcher/configure/l02/L02AppInfo.java
index d0a9c45..7a78c70 100644 (file)
--- a/app/src/main/java/com/ic/launcher/configure/l02/L02AppInfo.java
+++ b/app/src/main/java/com/ic/launcher/configure/l02/L02AppInfo.java
@@ -158,6 +158,9 @@ public class L02AppInfo {
             //运动
             add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_pedometer_l02, R.string.app_Sport,
                     "com.ic.hardware", "com.ic.hardware.PedometerActivity"));
+            //运动
+            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.practice_logo, R.string.app_practise,
+                    "com.ic.launcher", "com.ic.launcher.PractiseActivity"));
             //短信
             add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_sms_l02, R.string.app_Sms,
                     "com.zmapp.sms", "com.zmapp.sms.MainActivity"));

diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 0871faa..dccf667 100644 (file)
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -87,6 +87,9 @@
        <string name="app_Calendar">Calendar</string>
        <string name="app_clearRam">Clear</string>
        <string name="app_Sport">Fitness</string>
+       <string name="app_practise">Practice</string>
+       <string name="app_practising">Practising</string>
+       <string name="app_practise_stoped">PracticeStoped</string>
        <string name="app_xu_yuan_xing">Wishing Star</string>
        <string name="app_qr_code">QR Code</string>
        <string name="app_HeartRate">Heart Rate</string>

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index af3aab3..fe7c380 100644 (file)
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -81,6 +81,9 @@
     <string name="app_Calendar">日历</string>
     <string name="app_clearRam">清理内存</string>
     <string name="app_Sport">运动</string>
+    <string name="app_practise">自由锻炼</string>
+    <string name="app_practising">自由锻炼中</string>
+    <string name="app_practise_stoped">锻炼已停止</string>
     <string name="app_xu_yuan_xing">许愿星</string>
     <string name="app_qr_code">CID</string>
     <string name="app_HeartRate">心率</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d8d27d4..e87b4f5 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -81,6 +81,9 @@
     <string name="app_Calendar">日历</string>
     <string name="app_clearRam">清理内存</string>
     <string name="app_Sport">运动</string>
+    <string name="app_practise">自由锻炼</string>
+    <string name="app_practising">自由锻炼中</string>
+    <string name="app_practise_stoped">锻炼已停止</string>
     <string name="app_xu_yuan_xing">许愿星</string>
     <string name="app_qr_code">CID</string>
     <string name="app_HeartRate">心率</string>

diff --git a/app/version_code.properties b/app/version_code.properties
index f1d9612..c6b6e5b 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Sep 08 20:09:58 CST 2020\r
-VERSION_CODE=148\r
+#Tue Sep 15 21:05:03 CST 2020\r
+VERSION_CODE=149\r