From: kfl_614 Date: Thu, 20 Aug 2020 03:17:18 +0000 (+0800) Subject: 1.H88 X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=3f585ed0bb5adf952e70a4ba5eaad94bdb33d110;p=launcher4.git 1.H88 Signed-off-by: kfl_614 --- diff --git a/app/build.gradle b/app/build.gradle index 97873d8..a39fe38 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' static def getL02ApkBaseName() { - return "ICL02Launcher" + return "ICH88Launcher" } android { @@ -144,5 +144,5 @@ dependencies { implementation 'com.jakewharton:butterknife:10.2.1' annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1' - implementation 'org.greenrobot:eventbus:3.2.0' + implementation 'com.github.silvestrpredko:dot-progress-bar:1.1' } diff --git a/app/src/main/aidl/com/ic/aidl/temp/ITempAidlInterface.aidl b/app/src/main/aidl/com/ic/aidl/temp/ITempAidlInterface.aidl new file mode 100644 index 0000000..2feb420 --- /dev/null +++ b/app/src/main/aidl/com/ic/aidl/temp/ITempAidlInterface.aidl @@ -0,0 +1,11 @@ +// ITempAidlInterface.aidl +package com.ic.aidl.temp; + +interface ITempAidlInterface { + /** + * Demonstrates some basic types that you can use as parameters + * and return values in AIDL. + */ + void updateCurrTempValue(double value,double animal); + void updateResultTempValue(double value,double animal); +} diff --git a/app/src/main/aidl/com/ic/aidl/temp/ITempRemoteService.aidl b/app/src/main/aidl/com/ic/aidl/temp/ITempRemoteService.aidl new file mode 100644 index 0000000..bad691f --- /dev/null +++ b/app/src/main/aidl/com/ic/aidl/temp/ITempRemoteService.aidl @@ -0,0 +1,18 @@ +// ITempRemoteService.aidl +package com.ic.aidl.temp; + +// Declare any non-default types here with import statements + +import com.ic.aidl.temp.ITempAidlInterface; + +interface ITempRemoteService { + /** + * Demonstrates some basic types that you can use as parameters + * and return values in AIDL. + */ + void registerCallback(ITempAidlInterface cb); + void unregisterCallback(ITempAidlInterface cb); + + void onStartQueryTemp(); + void onStopQueryTemp(); +} diff --git a/app/src/main/java/com/ic/launcher/AnimalHeatActivity.java b/app/src/main/java/com/ic/launcher/AnimalHeatActivity.java index 5c7213a..451fbc6 100644 --- a/app/src/main/java/com/ic/launcher/AnimalHeatActivity.java +++ b/app/src/main/java/com/ic/launcher/AnimalHeatActivity.java @@ -3,53 +3,79 @@ package com.ic.launcher; import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; import androidx.core.view.GestureDetectorCompat; +import androidx.databinding.DataBindingUtil; +import android.annotation.SuppressLint; import android.content.BroadcastReceiver; +import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.content.ServiceConnection; import android.os.Bundle; import android.os.Handler; +import android.os.IBinder; import android.os.Message; +import android.os.PowerManager; +import android.os.RemoteException; import android.text.TextUtils; import android.view.KeyEvent; import android.view.MotionEvent; import android.widget.TextView; +import com.ic.aidl.temp.ITempAidlInterface; +import com.ic.aidl.temp.ITempRemoteService; +import com.ic.launcher.databinding.ActivityAnimalHeatBinding; import com.ic.launcher.listener.MainClockGestureDetectorImpl; -import com.ic.launcher.util.IcLog; +import com.ic.launcher.util.ServiceUtil; import java.lang.ref.WeakReference; import java.text.DecimalFormat; +import butterknife.BindString; +import butterknife.ButterKnife; + public class AnimalHeatActivity extends AppCompatActivity implements - MainClockGestureDetectorImpl.OnClockGestureFlingListener{ + MainClockGestureDetectorImpl.OnClockGestureFlingListener { + + @BindString(R.string.activity_temp_tips_check) + String tipsCheck; - private static final String GET_TEMPERATURE_ACTION = "com.ic.action.GET_TEMPERATURE"; - private static final String TEMPERATURE_KEY = "TEMPERATURE_KEY"; - private static final String TEMPERATURE_FINISH_ACTION = "com.ic.action.TEMPERATURE_FINISH"; + @BindString(R.string.activity_temp_tips_end) + String tipsEnd; private GestureDetectorCompat gesture; + private ITempRemoteService mService; - private TextView temperatureView; + private HeatHandler mHandler; + private PowerManager.WakeLock mWakeLock = null; - private HeatHandler heatHandler; + private ActivityAnimalHeatBinding heatBinding; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_animal_heat); - temperatureView = findViewById(R.id.temperature_value); - heatHandler = new HeatHandler(this); + heatBinding = DataBindingUtil.setContentView(this,R.layout.activity_animal_heat); + ButterKnife.bind(this); + mHandler = new HeatHandler(this); gesture = new GestureDetectorCompat(this, new MainClockGestureDetectorImpl(this)); registerBroadcast(); - sendTemperatureBroadcast(); + bindWorkService(this); + initWakeLock(this); + heatBinding.setBodyTemp("--"); + heatBinding.setWristTemp("--"); } + + @Override protected void onDestroy() { super.onDestroy(); - heatHandler.removeMessages(1); - heatHandler=null; + try { + mService.onStopQueryTemp(); + } catch (Exception e) { + } + releaseWakeLock(); + unbindWorkService(this); unregisterReceiver(mIntentReceiver); } @@ -82,19 +108,88 @@ public class AnimalHeatActivity extends AppCompatActivity implements return true; } - public void registerBroadcast() { + private void setTemperatureUi(int type, double temp, double animal) { + DecimalFormat df = new DecimalFormat("#.0"); + switch (type){ + case 0: + heatBinding.setBodyTemp(df.format(animal)); + heatBinding.setWristTemp(df.format(temp)); + break; + case 1: + heatBinding.setShowLoading(false); + heatBinding.setCheckTips(tipsEnd); + break; + } + } + + private void bindWorkService(Context context) { + ServiceUtil.bindServiceUtil(context, + "com.ic.action.WORK_SERVICE", + connection, + "com.ic.temp"); + } + + private void unbindWorkService(Context context) { + try { + if (mService != null) { + mService.unregisterCallback(tempInterface); + } + ServiceUtil.unBindServiceUtil(context, connection); + } catch (Exception e) { + } finally { + mService = null; + tempInterface = null; + connection = null; + } + } + + private ServiceConnection connection = new ServiceConnection() { + @Override + public void onServiceConnected(ComponentName name, IBinder service) { + try { + mService = ITempRemoteService.Stub.asInterface(service); + mService.registerCallback(tempInterface); + mService.onStartQueryTemp(); + heatBinding.setShowLoading(true); + heatBinding.setCheckTips(tipsCheck); + } catch (Exception e) { + } + } + + @Override + public void onServiceDisconnected(ComponentName name) { + } + }; + + private ITempAidlInterface.Stub tempInterface = new ITempAidlInterface.Stub() { + @Override + public void updateCurrTempValue(double value, double animal) throws RemoteException { + mHandler.sendMessage(obtainMessage(0, value, animal)); + } + + @Override + public void updateResultTempValue(double value, double animal) throws RemoteException { + mHandler.sendMessage(obtainMessage(1, value, animal)); + } + }; + + private Message obtainMessage(int type, double value, double animal) { + Message message = Message.obtain(); + message.what = 1; + Bundle bundle = new Bundle(); + bundle.putInt("type", type); + bundle.putDouble("value", value); + bundle.putDouble("animal", animal); + message.setData(bundle); + return message; + } + + private void registerBroadcast() { IntentFilter filter = new IntentFilter(); - filter.addAction(TEMPERATURE_FINISH_ACTION); filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS); registerReceiver(mIntentReceiver, filter); } - private void sendTemperatureBroadcast() { - Intent pedIntent = new Intent(); - pedIntent.setAction(GET_TEMPERATURE_ACTION); - sendBroadcast(pedIntent); - } - private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { @@ -104,14 +199,6 @@ public class AnimalHeatActivity extends AppCompatActivity implements return; } switch (acyion) { - case TEMPERATURE_FINISH_ACTION: - double temperature = intent.getDoubleExtra(TEMPERATURE_KEY,0); - DecimalFormat df = new DecimalFormat("#.0"); - temperatureView.setText(df.format(temperature)); - if(heatHandler != null){ - heatHandler.sendEmptyMessageDelayed(1,800); - } - break; case Intent.ACTION_CLOSE_SYSTEM_DIALOGS: String reason = intent.getStringExtra("reason"); if ("homekey".equals(reason)) { @@ -124,24 +211,41 @@ public class AnimalHeatActivity extends AppCompatActivity implements } }; - private static class HeatHandler extends Handler{ + private static class HeatHandler extends Handler { private WeakReference weakRf; - public HeatHandler(AnimalHeatActivity activity){ + public HeatHandler(AnimalHeatActivity activity) { weakRf = new WeakReference<>(activity); } @Override public void dispatchMessage(@NonNull Message msg) { super.dispatchMessage(msg); - switch (msg.what){ + switch (msg.what) { case 1: - IcLog.i("TSEEE","DDDDDDDDDD"); - weakRf.get().sendTemperatureBroadcast(); + Bundle bundle = msg.getData(); + weakRf.get().setTemperatureUi( + bundle.getInt("type"), + bundle.getDouble("value"), + bundle.getDouble("animal")); break; } } } + @SuppressLint("InvalidWakeLockTag") + private void initWakeLock(Context context) { + PowerManager powerManager = (PowerManager) context.getSystemService(POWER_SERVICE); + if (powerManager != null) { + mWakeLock = powerManager.newWakeLock(PowerManager.FULL_WAKE_LOCK, "TmepWakeLock"); + mWakeLock.acquire(); + } + } + private void releaseWakeLock() { + if (mWakeLock != null) { + mWakeLock.release(); + } + mWakeLock = null; + } } \ No newline at end of file diff --git a/app/src/main/java/com/ic/launcher/FragmentManage.java b/app/src/main/java/com/ic/launcher/FragmentManage.java index dbfabf7..70a72a8 100644 --- a/app/src/main/java/com/ic/launcher/FragmentManage.java +++ b/app/src/main/java/com/ic/launcher/FragmentManage.java @@ -13,12 +13,10 @@ import com.ic.launcher.fragment.L02MainFragment; import com.ic.launcher.fragment.LowPowerModeFragment; import com.ic.launcher.fragment.clock.Clock12DialFragment; import com.ic.launcher.fragment.clock.Clock6DialFragment; -import com.ic.launcher.mode.L02MainModel; import com.ic.launcher.util.SPUtils; import static com.ic.launcher.configure.l02.L02Icon.CLOCK_INDEX_12; import static com.ic.launcher.configure.l02.L02Icon.CLOCK_INDEX_6; -import static com.ic.launcher.configure.l02.L02Icon.CLOCK_INDEX_L02; public class FragmentManage { @@ -72,8 +70,7 @@ public class FragmentManage { void changeMainClock(boolean finish) { Fragment fragment = getCurrMainFragment(); Fragment oldFt = getFragmentList(MAIN_FRAGMENT_INDEX); - if ((fragment instanceof L02MainFragment && oldFt instanceof L02MainFragment) - || (fragment instanceof Clock6DialFragment && oldFt instanceof Clock6DialFragment) + if ((fragment instanceof Clock6DialFragment && oldFt instanceof Clock6DialFragment) || (fragment instanceof Clock12DialFragment && oldFt instanceof Clock12DialFragment)) { return; } diff --git a/app/src/main/java/com/ic/launcher/MainActivity.java b/app/src/main/java/com/ic/launcher/MainActivity.java index 7dfebe4..0d2dcba 100644 --- a/app/src/main/java/com/ic/launcher/MainActivity.java +++ b/app/src/main/java/com/ic/launcher/MainActivity.java @@ -1,12 +1,14 @@ package com.ic.launcher; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; import androidx.lifecycle.ViewModelProvider; +import android.app.Activity; import android.app.Application; import android.content.BroadcastReceiver; import android.content.Context; @@ -14,6 +16,8 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.res.Configuration; import android.os.Bundle; +import android.os.Handler; +import android.os.Message; import android.view.KeyEvent; import com.ic.launcher.fragment.dialog.ImageTipsFragment; @@ -27,10 +31,13 @@ import com.ic.launcher.util.IcLog; import com.ic.launcher.util.ServiceUtil; import com.ic.launcher.util.SystemUtils; +import java.lang.ref.WeakReference; + public class MainActivity extends AppCompatActivity implements MainClockGestureDetectorImpl.OnClockGestureFlingListener, - IChangeMainFragmentListener { + IChangeMainFragmentListener, + ImageTipsFragment.OnImageTipsListener { private static final String TAG = "MainActivity"; @@ -43,11 +50,16 @@ public class MainActivity extends AppCompatActivity implements private boolean isChangeClock = false; private String lowBatteryValue; + private boolean isShowSlipTips = false; + private boolean isShowMessageTips = false; + + //private TestHandler mHandler; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + ftManage = new FragmentManage(this, getSupportFragmentManager()); ftManage.showCurrMainFragment(isFinishing(), 0); @@ -55,6 +67,9 @@ public class MainActivity extends AppCompatActivity implements ((IcLauncherApplication) getApplication()).getTimeDatePresenter().registerTimeDateReceiver(); registerChangeClockReceiver(); + //mHandler = new TestHandler(this); + //mHandler.sendEmptyMessageDelayed(1, 3000); + initLowPowerModel(getApplication()); ServiceUtil.startServiceUtil(getApplicationContext(), @@ -112,6 +127,16 @@ public class MainActivity extends AppCompatActivity implements ((IcLauncherApplication) getApplication()).getAppListPresenter().updateLanguageSystemApp(); } + @Override + protected void onSaveInstanceState(Bundle outState) { + //No call for super(). Bug on API Level > 11. + } + + @Override + public void OnDialogDismiss() { + isShowMessageTips=false; + } + private void startTestProtocol() { try { String cid = SystemUtils.GetCidFromSystem(); @@ -143,7 +168,7 @@ public class MainActivity extends AppCompatActivity implements isLowPower = status; isChangeClock = false; if (status) { - ftManage.gotoLowPowerMode(isFinishing(),lowBatteryValue); + ftManage.gotoLowPowerMode(isFinishing(), lowBatteryValue); } else { ftManage.quitLowPowerMode(isFinishing()); } @@ -158,12 +183,12 @@ public class MainActivity extends AppCompatActivity implements lowBatteryValue = value; } - private static final String TXT_ACTION ="action.ic.srvPushTxt"; - private static final String TYPE_KEY ="msgType"; - private static final String MSG_KEY ="txtMsg"; + private static final String TXT_ACTION = "action.ic.srvPushTxt"; + private static final String TYPE_KEY = "msgType"; + private static final String MSG_KEY = "txtMsg"; - private static final String STRIP_ACTION ="com.ic.ACTION_STRIP"; - private static final String EVENT_KEY ="eventID"; + private static final String STRIP_ACTION = "com.ic.ACTION_STRIP"; + private static final String EVENT_KEY = "eventID"; private void registerChangeClockReceiver() { IntentFilter filter = new IntentFilter(); @@ -185,14 +210,14 @@ public class MainActivity extends AppCompatActivity implements @Override public void onReceive(Context context, Intent intent) { String action = intent.getAction(); - switch (action){ + switch (action) { case TXT_ACTION: - int type = intent.getIntExtra(TYPE_KEY,-1); + int type = intent.getIntExtra(TYPE_KEY, -1); String message = intent.getStringExtra(MSG_KEY); - if(type == 0 || type == 1){ - IcLauncherApplication app = (IcLauncherApplication)getApplication(); + if (type == 0 || type == 1) { + IcLauncherApplication app = (IcLauncherApplication) getApplication(); BatteryPresenter batteryPresenter = app.getBatteryPresenter(); - switch (message){ + switch (message) { case "socializing": batteryPresenter.playSoundIndex(5); break; @@ -208,7 +233,7 @@ public class MainActivity extends AppCompatActivity implements } break; case STRIP_ACTION: - int event = intent.getIntExtra(EVENT_KEY,-1); + int event = intent.getIntExtra(EVENT_KEY, -1); switch (event) { case 1: showSlipTipsDialog(); @@ -226,6 +251,10 @@ public class MainActivity extends AppCompatActivity implements }; private void showImageTipsDialog(String message) { + if (isShowMessageTips) { + return; + } + isShowMessageTips = true; FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); Fragment prev = getSupportFragmentManager().findFragmentByTag("ImageTips"); if (prev != null) { @@ -233,12 +262,23 @@ public class MainActivity extends AppCompatActivity implements } ft.addToBackStack(null); - // Create and show the dialog. - DialogFragment newFragment = ImageTipsFragment.newInstance(message); - newFragment.show(ft, "ImageTips"); + try { + // Create and show the dialog. + ImageTipsFragment newFragment = ImageTipsFragment.newInstance(message); + newFragment.setOnImageTipsListener(this); + newFragment.show(ft, "ImageTips"); + } catch (IllegalStateException e) { + isShowMessageTips = false; + } } private void showSlipTipsDialog() { + if (isShowSlipTips) { + return; + } + + isShowSlipTips = true; + FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); Fragment prev = getSupportFragmentManager().findFragmentByTag("SlipTips"); if (prev != null) { @@ -246,12 +286,21 @@ public class MainActivity extends AppCompatActivity implements } ft.addToBackStack(null); - // Create and show the dialog. - DialogFragment newFragment = SlipTipsFragment.newInstance(); - newFragment.show(ft, "SlipTips"); + try { + // Create and show the dialog. + SlipTipsFragment newFragment = SlipTipsFragment.newInstance(); + newFragment.show(ft, "SlipTips"); + } catch (IllegalStateException e) { + isShowSlipTips = false; + } + } private void dismissSlipTipsDialog() { + if (!isShowSlipTips) { + return; + } + isShowSlipTips = false; Fragment prev = getSupportFragmentManager().findFragmentByTag("SlipTips"); if (prev != null) { DialogFragment df = (DialogFragment) prev; @@ -260,10 +309,29 @@ public class MainActivity extends AppCompatActivity implements } private void testMessageBroadcast() { - Intent intent = new Intent("action.ic.srvPushTxt"); - intent.putExtra("msgType", 1); //0 代表 server下发消息，1代表 SMS消息 - intent.putExtra("txtMsg", "high body temperature"); + Intent intent = new Intent(TXT_ACTION); + intent.putExtra(TYPE_KEY, 1); //0 代表 server下发消息，1代表 SMS消息 + intent.putExtra(MSG_KEY, "ffffffffffffffffffff"); sendBroadcast(intent); } + + private static class TestHandler extends Handler { + private WeakReference weakRf; + + public TestHandler(MainActivity activity) { + weakRf = new WeakReference<>(activity); + } + + @Override + public void dispatchMessage(@NonNull Message msg) { + super.dispatchMessage(msg); + switch (msg.what) { + case 1: + weakRf.get().testMessageBroadcast(); + break; + } + } + } + } 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 b18dd62..8926603 100644 --- a/app/src/main/java/com/ic/launcher/configure/l02/L02AppInfo.java +++ b/app/src/main/java/com/ic/launcher/configure/l02/L02AppInfo.java @@ -106,6 +106,9 @@ public class L02AppInfo { add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_temperature_h88, R.string.app_h88_temperature, "com.ic.launcher", "com.ic.launcher.AnimalHeatActivity")); + //心率 + add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_heartrate_l02, R.string.app_name_heart, + "com.ic.blood", "com.ic.blood.BloodActivity")); //联系人 add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_contacts_l02, R.string.app_ContactName, "com.enqualcomm.imessage", "com.enqualcomm.imessage.ui.PhoneDirectoryActivity")); diff --git a/app/src/main/java/com/ic/launcher/fragment/LowPowerModeFragment.java b/app/src/main/java/com/ic/launcher/fragment/LowPowerModeFragment.java index b698670..fd75b91 100644 --- a/app/src/main/java/com/ic/launcher/fragment/LowPowerModeFragment.java +++ b/app/src/main/java/com/ic/launcher/fragment/LowPowerModeFragment.java @@ -16,6 +16,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import com.ic.launcher.BuildConfig; import com.ic.launcher.configure.l02.L02AppInfo; import com.ic.launcher.databinding.FragmentLowPowerModeBinding; import com.ic.launcher.entity.AppInfoEntity; @@ -80,7 +81,11 @@ public class LowPowerModeFragment extends Fragment { } private ILowPowerCallPhoneListener callListener = () -> { - AppInfoEntity entity = L02AppInfo.getAppList().get(1); + int value=1; + if(BuildConfig.V_TYPE == 2){ + value = 4; + } + AppInfoEntity entity = L02AppInfo.getAppList().get(value); if (entity != null) { try { Intent intent = new Intent(Intent.ACTION_MAIN); diff --git a/app/src/main/java/com/ic/launcher/fragment/dialog/ImageTipsFragment.java b/app/src/main/java/com/ic/launcher/fragment/dialog/ImageTipsFragment.java index 79239f8..566a80e 100644 --- a/app/src/main/java/com/ic/launcher/fragment/dialog/ImageTipsFragment.java +++ b/app/src/main/java/com/ic/launcher/fragment/dialog/ImageTipsFragment.java @@ -18,6 +18,11 @@ public class ImageTipsFragment extends DialogFragment { private static final String ARG_PARAM1 = "param1"; private String value; + private OnImageTipsListener listener; + + public interface OnImageTipsListener { + void OnDialogDismiss(); + } public static ImageTipsFragment newInstance(String param1) { ImageTipsFragment fragment = new ImageTipsFragment(); @@ -27,6 +32,10 @@ public class ImageTipsFragment extends DialogFragment { return fragment; } + public void setOnImageTipsListener(OnImageTipsListener listener) { + this.listener = listener; + } + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -57,6 +66,7 @@ public class ImageTipsFragment extends DialogFragment { textView.setText(value); ImageView image = view.findViewById(R.id.image_bt_close); image.setOnClickListener(v ->{ + listener.OnDialogDismiss(); dismiss(); }); return view; diff --git a/app/src/main/java/com/ic/launcher/util/ServiceUtil.java b/app/src/main/java/com/ic/launcher/util/ServiceUtil.java index 1a3b429..9441958 100644 --- a/app/src/main/java/com/ic/launcher/util/ServiceUtil.java +++ b/app/src/main/java/com/ic/launcher/util/ServiceUtil.java @@ -19,15 +19,18 @@ public class ServiceUtil { } } - public static void bindServiceUtil(Context context , String action, ServiceConnection connection,String pck,int type) { + public static void bindServiceUtil(Context context , String action, ServiceConnection connection,String pck) { Intent in = getExplicitIntent(context, new Intent(action)); if(in != null){ in.setPackage(pck); - in.putExtra("REQ_TYPE",type); context.bindService(in, connection, 0); } } + public static void unBindServiceUtil(Context context ,ServiceConnection connection) { + context.unbindService(connection); + } + private static Intent getExplicitIntent(Context context, Intent impl) { List resolveInfo = context.getPackageManager().queryIntentServices(impl, 0); diff --git a/app/src/main/res/drawable/ic_temp_human.xml b/app/src/main/res/drawable/ic_temp_human.xml new file mode 100644 index 0000000..5e9b037 --- /dev/null +++ b/app/src/main/res/drawable/ic_temp_human.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_temp_wrist.xml b/app/src/main/res/drawable/ic_temp_wrist.xml new file mode 100644 index 0000000..f26ff82 --- /dev/null +++ b/app/src/main/res/drawable/ic_temp_wrist.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_animal_heat.xml b/app/src/main/res/layout/activity_animal_heat.xml index 9fa5d51..599d406 100644 --- a/app/src/main/res/layout/activity_animal_heat.xml +++ b/app/src/main/res/layout/activity_animal_heat.xml @@ -1,36 +1,173 @@ - - - - - - - \ No newline at end of file + xmlns:tools="http://schemas.android.com/tools"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-mdpi/a9_albumn_l02.png b/app/src/main/res/mipmap-mdpi/a9_albumn_l02.png new file mode 100644 index 0000000..c452068 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_albumn_l02.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_alipay_l02.png b/app/src/main/res/mipmap-mdpi/a9_alipay_l02.png new file mode 100644 index 0000000..7f7e4c4 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_alipay_l02.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_battery_0.png b/app/src/main/res/mipmap-mdpi/a9_battery_0.png new file mode 100644 index 0000000..4f0c40e Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_battery_0.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_battery_1.png b/app/src/main/res/mipmap-mdpi/a9_battery_1.png new file mode 100644 index 0000000..2ba5cc0 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_battery_1.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_battery_2.png b/app/src/main/res/mipmap-mdpi/a9_battery_2.png new file mode 100644 index 0000000..fdf6d6f Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_battery_2.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_battery_3.png b/app/src/main/res/mipmap-mdpi/a9_battery_3.png new file mode 100644 index 0000000..19c7c0c Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_battery_3.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_battery_4.png b/app/src/main/res/mipmap-mdpi/a9_battery_4.png new file mode 100644 index 0000000..a1d396d Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_battery_4.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_battery_5.png b/app/src/main/res/mipmap-mdpi/a9_battery_5.png new file mode 100644 index 0000000..348ef53 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_battery_5.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_camera_l02.png b/app/src/main/res/mipmap-mdpi/a9_camera_l02.png new file mode 100644 index 0000000..5f242b2 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_camera_l02.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_contacts_l02.png b/app/src/main/res/mipmap-mdpi/a9_contacts_l02.png new file mode 100644 index 0000000..c32315e Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_contacts_l02.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_dialer_l02.png b/app/src/main/res/mipmap-mdpi/a9_dialer_l02.png new file mode 100644 index 0000000..b6252dc Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_dialer_l02.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_heartrate_icon.png b/app/src/main/res/mipmap-mdpi/a9_heartrate_icon.png new file mode 100644 index 0000000..eb83864 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_heartrate_icon.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_heartrate_l02.png b/app/src/main/res/mipmap-mdpi/a9_heartrate_l02.png new file mode 100644 index 0000000..b7e16d0 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_heartrate_l02.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_hour_0.png b/app/src/main/res/mipmap-mdpi/a9_hour_0.png new file mode 100644 index 0000000..fe5cdeb Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_hour_0.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_hour_1.png b/app/src/main/res/mipmap-mdpi/a9_hour_1.png new file mode 100644 index 0000000..1575506 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_hour_1.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_hour_2.png b/app/src/main/res/mipmap-mdpi/a9_hour_2.png new file mode 100644 index 0000000..590caf4 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_hour_2.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_hour_3.png b/app/src/main/res/mipmap-mdpi/a9_hour_3.png new file mode 100644 index 0000000..1159c4f Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_hour_3.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_hour_4.png b/app/src/main/res/mipmap-mdpi/a9_hour_4.png new file mode 100644 index 0000000..ef74787 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_hour_4.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_hour_5.png b/app/src/main/res/mipmap-mdpi/a9_hour_5.png new file mode 100644 index 0000000..c5e7a8d Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_hour_5.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_hour_6.png b/app/src/main/res/mipmap-mdpi/a9_hour_6.png new file mode 100644 index 0000000..ab3cd09 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_hour_6.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_hour_7.png b/app/src/main/res/mipmap-mdpi/a9_hour_7.png new file mode 100644 index 0000000..9794ea3 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_hour_7.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_hour_8.png b/app/src/main/res/mipmap-mdpi/a9_hour_8.png new file mode 100644 index 0000000..97a8faa Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_hour_8.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_hour_9.png b/app/src/main/res/mipmap-mdpi/a9_hour_9.png new file mode 100644 index 0000000..0ce8178 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_hour_9.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_language_h88.png b/app/src/main/res/mipmap-mdpi/a9_language_h88.png new file mode 100644 index 0000000..cb3c0ff Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_language_h88.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_minutes_0.png b/app/src/main/res/mipmap-mdpi/a9_minutes_0.png new file mode 100644 index 0000000..fa77bd5 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_minutes_0.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_minutes_1.png b/app/src/main/res/mipmap-mdpi/a9_minutes_1.png new file mode 100644 index 0000000..fae4b0b Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_minutes_1.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_minutes_2.png b/app/src/main/res/mipmap-mdpi/a9_minutes_2.png new file mode 100644 index 0000000..5628e03 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_minutes_2.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_minutes_3.png b/app/src/main/res/mipmap-mdpi/a9_minutes_3.png new file mode 100644 index 0000000..0d060bf Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_minutes_3.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_minutes_4.png b/app/src/main/res/mipmap-mdpi/a9_minutes_4.png new file mode 100644 index 0000000..6e0649b Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_minutes_4.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_minutes_5.png b/app/src/main/res/mipmap-mdpi/a9_minutes_5.png new file mode 100644 index 0000000..905fd3b Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_minutes_5.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_minutes_6.png b/app/src/main/res/mipmap-mdpi/a9_minutes_6.png new file mode 100644 index 0000000..22f863c Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_minutes_6.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_minutes_7.png b/app/src/main/res/mipmap-mdpi/a9_minutes_7.png new file mode 100644 index 0000000..9f98c20 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_minutes_7.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_minutes_8.png b/app/src/main/res/mipmap-mdpi/a9_minutes_8.png new file mode 100644 index 0000000..f3d38de Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_minutes_8.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_minutes_9.png b/app/src/main/res/mipmap-mdpi/a9_minutes_9.png new file mode 100644 index 0000000..48e192d Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_minutes_9.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_pedometer.png b/app/src/main/res/mipmap-mdpi/a9_pedometer.png new file mode 100644 index 0000000..8881488 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_pedometer.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_pedometer_l02.png b/app/src/main/res/mipmap-mdpi/a9_pedometer_l02.png new file mode 100644 index 0000000..3931075 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_pedometer_l02.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_phone_type_4g.png b/app/src/main/res/mipmap-mdpi/a9_phone_type_4g.png new file mode 100644 index 0000000..a01a9bb Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_phone_type_4g.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_qr_code_h88.png b/app/src/main/res/mipmap-mdpi/a9_qr_code_h88.png new file mode 100644 index 0000000..8b4d224 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_qr_code_h88.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_settings_l02.png b/app/src/main/res/mipmap-mdpi/a9_settings_l02.png new file mode 100644 index 0000000..ad4b4f2 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_settings_l02.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_signal_0.png b/app/src/main/res/mipmap-mdpi/a9_signal_0.png new file mode 100644 index 0000000..6c38c47 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_signal_0.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_signal_1.png b/app/src/main/res/mipmap-mdpi/a9_signal_1.png new file mode 100644 index 0000000..ab222b1 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_signal_1.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_signal_2.png b/app/src/main/res/mipmap-mdpi/a9_signal_2.png new file mode 100644 index 0000000..07ce173 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_signal_2.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_signal_3.png b/app/src/main/res/mipmap-mdpi/a9_signal_3.png new file mode 100644 index 0000000..97d569a Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_signal_3.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_signal_4.png b/app/src/main/res/mipmap-mdpi/a9_signal_4.png new file mode 100644 index 0000000..dc01d22 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_signal_4.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_signal_x.png b/app/src/main/res/mipmap-mdpi/a9_signal_x.png new file mode 100644 index 0000000..c27b208 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_signal_x.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_sms_l02.png b/app/src/main/res/mipmap-mdpi/a9_sms_l02.png new file mode 100644 index 0000000..b9459d9 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_sms_l02.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_talk_l02.png b/app/src/main/res/mipmap-mdpi/a9_talk_l02.png new file mode 100644 index 0000000..f415aa1 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_talk_l02.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_temperature_h88.png b/app/src/main/res/mipmap-mdpi/a9_temperature_h88.png new file mode 100644 index 0000000..4abd5fb Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_temperature_h88.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_time_colon.png b/app/src/main/res/mipmap-mdpi/a9_time_colon.png new file mode 100644 index 0000000..22c4d23 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_time_colon.png differ diff --git a/app/src/main/res/mipmap-mdpi/a9_weather_l02.png b/app/src/main/res/mipmap-mdpi/a9_weather_l02.png new file mode 100644 index 0000000..ad0c377 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/a9_weather_l02.png differ diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 5b99737..0871faa 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -7,7 +7,7 @@ QR Code TEMP - language + Language Settings My Family @@ -128,4 +128,9 @@ HP LP + + BODY + WRIST + MEASURING + COMPLETE diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index af8b2a1..59343d9 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -131,4 +131,10 @@ ศุกร์ วันเสาร์ อาทิตย์ + + คน + ข้อมือ + ℃ + การวัดอุณหภูมิ + ดำเนินการ diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 944ee06..af3aab3 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -129,4 +129,9 @@ 高压 低压 + + 体温 + 腕温 + 正在测量 + 测量完成 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a6c7882..d8d27d4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -129,4 +129,10 @@ 高压 低压 + + 体温 + 腕温 + ℃ + 正在测量 + 测量完成 \ No newline at end of file diff --git a/app/version_code.properties b/app/version_code.properties index a132217..2bc03ed 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Sun Jun 28 13:11:14 CST 2020 -VERSION_CODE=99 +#Wed Jul 29 21:08:37 CST 2020 +VERSION_CODE=136