From: snickersun Date: Tue, 15 Sep 2020 03:35:04 +0000 (+0800) Subject: release IcA9LauncherCN V1_5.0 202009151221 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=a441acd781f37904693589304caa6d04b3a66d7a;p=aklauncher.git release IcA9LauncherCN V1_5.0 202009151221 编译中文版本A9 Launcher 暂时不支持动态切换 --- diff --git a/app/IcA9LauncherCN/release/IcA9LauncherCN_V1_5.0_202009151121_release.apk b/app/IcA9LauncherCN/release/IcA9LauncherCN_V1_5.0_202009151121_release.apk new file mode 100644 index 0000000..9b435bb Binary files /dev/null and b/app/IcA9LauncherCN/release/IcA9LauncherCN_V1_5.0_202009151121_release.apk differ diff --git a/app/src/main/java/com/ic/ak/launcher/data/app/AppDispose.java b/app/src/main/java/com/ic/ak/launcher/data/app/AppDispose.java index d63603d..411d123 100644 --- a/app/src/main/java/com/ic/ak/launcher/data/app/AppDispose.java +++ b/app/src/main/java/com/ic/ak/launcher/data/app/AppDispose.java @@ -90,6 +90,7 @@ public class AppDispose { case 1001: return MainFragment.newInstance(); case 1002: + case 1003: return MainA9Fragment.newInstance(); default: return MainFragment.newInstance(); diff --git a/app/src/main/java/com/ic/ak/launcher/data/battery/BatteryDispose.java b/app/src/main/java/com/ic/ak/launcher/data/battery/BatteryDispose.java index ff390a5..33531a0 100644 --- a/app/src/main/java/com/ic/ak/launcher/data/battery/BatteryDispose.java +++ b/app/src/main/java/com/ic/ak/launcher/data/battery/BatteryDispose.java @@ -155,6 +155,7 @@ public class BatteryDispose { switch (product){ case 1001: return AKBatteryResId; + case 1003: case 1002: return A9BatteryResId; default: diff --git a/app/src/main/java/com/ic/ak/launcher/data/hardware/HardwareDispose.java b/app/src/main/java/com/ic/ak/launcher/data/hardware/HardwareDispose.java index 65b08a4..2dd808e 100644 --- a/app/src/main/java/com/ic/ak/launcher/data/hardware/HardwareDispose.java +++ b/app/src/main/java/com/ic/ak/launcher/data/hardware/HardwareDispose.java @@ -6,6 +6,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.text.TextUtils; +import android.util.Log; import androidx.lifecycle.MediatorLiveData; import androidx.lifecycle.MutableLiveData; @@ -81,11 +82,12 @@ public class HardwareDispose { filter.addAction(POWER_OFF_ACTION); filter.addAction(SOS_ACTION); filter.addAction(TXT_ACTION); + Log.i(TAG,"hrt registerHardwareBroadcast"); int product = BuildConfig.productType; if (product == 1001) { filter.addAction(ACTION_KEEPSIT_ALARM); } - if (product == 1002) { + if (product == 1002 || product == 1003) { filter.addAction(STRIP_ACTION); filter.addAction(ACTION_BATTERYLOW); } @@ -105,6 +107,7 @@ public class HardwareDispose { public void onReceive(Context context, Intent intent) { if (intent != null) { String acyion = intent.getAction(); + Log.i(TAG,"hrt acyion "+acyion); if (TextUtils.isEmpty(acyion)) { return; } @@ -115,6 +118,7 @@ public class HardwareDispose { break; case HEART_ACTION: int heart = intent.getIntExtra("BLOOD_HEART", 0); + Log.i(TAG,"hrt BLOOD_HEART "+heart); mObsHardwareHeart.setValue(String.valueOf(heart)); break; case STRIP_ACTION: diff --git a/app/src/main/java/com/ic/ak/launcher/data/phone/PhoneDispose.java b/app/src/main/java/com/ic/ak/launcher/data/phone/PhoneDispose.java index 582599b..40f4cf8 100644 --- a/app/src/main/java/com/ic/ak/launcher/data/phone/PhoneDispose.java +++ b/app/src/main/java/com/ic/ak/launcher/data/phone/PhoneDispose.java @@ -230,6 +230,7 @@ public class PhoneDispose extends LoopThread { switch (product){ case 1001: return akSignalResId; + case 1003: case 1002: return a9SignalResId; } @@ -242,6 +243,7 @@ public class PhoneDispose extends LoopThread { switch (product){ case 1001: return akPhoneTypeResId; + case 1003: case 1002: return a9PhoneTypeResId; } diff --git a/app/src/main/java/com/ic/ak/launcher/data/time/TimeDispose.java b/app/src/main/java/com/ic/ak/launcher/data/time/TimeDispose.java index 21bd408..afa56b1 100644 --- a/app/src/main/java/com/ic/ak/launcher/data/time/TimeDispose.java +++ b/app/src/main/java/com/ic/ak/launcher/data/time/TimeDispose.java @@ -145,7 +145,7 @@ public class TimeDispose { } } - if(product == 1002){ + if(product == 1002 ||product == 1003){ mObsYear.setValue(currDateTime.format(MMDD)); mObsTime.setValue(currDateTime.format(HH_MM)); mObsWeek.setValue(currDateTime.getDayOfWeek().getDisplayName(TextStyle.SHORT, Locale.getDefault())); diff --git a/app/src/main/java/com/ic/ak/launcher/ui/DialogActivity.java b/app/src/main/java/com/ic/ak/launcher/ui/DialogActivity.java index 494f059..c293a2b 100644 --- a/app/src/main/java/com/ic/ak/launcher/ui/DialogActivity.java +++ b/app/src/main/java/com/ic/ak/launcher/ui/DialogActivity.java @@ -106,7 +106,7 @@ public class DialogActivity extends AppCompatActivity { switch (type) { case 1000: case 1001: - if (BuildConfig.productType == 1002) { + if (BuildConfig.productType == 1002|| BuildConfig.productType == 1003) { if (showDialogManage == null) { showDialogManage = new TextShowDialogManage(); } else { @@ -160,7 +160,7 @@ public class DialogActivity extends AppCompatActivity { break; case 1007: playKeyboardSound(); - if (BuildConfig.productType == 1002) { + if (BuildConfig.productType == 1002 || BuildConfig.productType == 1003) { if (showDialogManage == null) { showDialogManage = new TextShowDialogManage(); } else { @@ -174,7 +174,7 @@ public class DialogActivity extends AppCompatActivity { private void playKeyboardSound(){ int type = BuildConfig.productType; - if(type == 1002){ + if(type == 1002 || type == 1003){ //A9 if(soundPlayUtils == null){ soundPlayUtils= new SoundPlayUtils(); diff --git a/app/src/main/java/com/ic/ak/launcher/ui/MainActivity.java b/app/src/main/java/com/ic/ak/launcher/ui/MainActivity.java index 102a1f8..1027e13 100644 --- a/app/src/main/java/com/ic/ak/launcher/ui/MainActivity.java +++ b/app/src/main/java/com/ic/ak/launcher/ui/MainActivity.java @@ -47,7 +47,7 @@ public class MainActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (BuildConfig.productType == 1002) { + if (BuildConfig.productType == 1002 || BuildConfig.productType == 1003) { setContentView(R.layout.activity_a9_main); } else if (BuildConfig.productType == 1001) { setContentView(R.layout.activity_main); diff --git a/app/src/main/java/com/ic/ak/launcher/ui/fragment/AppFragment.java b/app/src/main/java/com/ic/ak/launcher/ui/fragment/AppFragment.java index 7909e11..8efd381 100644 --- a/app/src/main/java/com/ic/ak/launcher/ui/fragment/AppFragment.java +++ b/app/src/main/java/com/ic/ak/launcher/ui/fragment/AppFragment.java @@ -73,7 +73,7 @@ public class AppFragment extends Fragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View view=null; - if(BuildConfig.productType == 1002){ + if(BuildConfig.productType == 1002 || BuildConfig.productType == 1003){ view = inflater.inflate(R.layout.fragment_a9_app, container, false); } else if(BuildConfig.productType == 1001){ view = inflater.inflate(R.layout.fragment_app, container, false);