() {
-
- @Override
- public int compare(GizMessage arg0, GizMessage arg1) {
-
- String updatedAt = DateUtil.utc2Local(arg0.getUpdatedAt());
- String updatedAt2 = DateUtil.utc2Local(arg1.getUpdatedAt());
-
- int diff = (int) DateUtil.getDiff(updatedAt2, updatedAt);
-
- return diff;
- }
-
- });
- }
-
- if (progressDialog.isShowing()) {
- progressDialog.cancel();
- }
- mymessageList = messageList;
- if (mymessageList.size() != 0) {
- tvNoMessage.setVisibility(View.GONE);
- }
- myadapter.notifyDataSetChanged();
- }
-
- });
- }
-}
diff --git a/src/main/java/com/gizwits/opensource/appkit/sharingdevice/gosZxingDeviceSharingActivity.java b/src/main/java/com/gizwits/opensource/appkit/sharingdevice/gosZxingDeviceSharingActivity.java
deleted file mode 100644
index 497019d..0000000
--- a/src/main/java/com/gizwits/opensource/appkit/sharingdevice/gosZxingDeviceSharingActivity.java
+++ /dev/null
@@ -1,235 +0,0 @@
-package com.gizwits.opensource.appkit.sharingdevice;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.gizwits.gizwifisdk.api.GizDeviceSharing;
-import com.gizwits.gizwifisdk.enumration.GizWifiErrorCode;
-import com.gizwits.gizwifisdk.listener.GizDeviceSharingListener;
-import com.gizwits.opensource.appkit.CommonModule.GosBaseActivity;
-import com.gizwits.opensource.appkit.R;
-import com.gizwits.opensource.appkit.utils.DateUtil;
-
-public class gosZxingDeviceSharingActivity extends GosBaseActivity {
-
- private String code;
- private int time = 15;
- private String[] split2s;
- private String tip;
- private TextView tiptext;
- private String token;
- private Button yes;
- private Button no;
- private TextView zxingtext;
- private String whoshared;
- private String[] splits;
- private String userName;
- private String productName;
- private String deviceAlias;
- private String expiredAt;
-
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- setContentView(R.layout.gos_devicesharing_zxing_activity);
- setToolBar(true, R.string.QR_code);
- initData();
- initView();
- }
-
- private void initView() {
-
- zxingtext = (TextView) findViewById(R.id.zxingtext);
-
- yes = (Button) findViewById(R.id.yes);
-
- no = (Button) findViewById(R.id.no);
-
- whoshared = getResources().getString(R.string.whoshared);
-
- splits = whoshared.split("xxx");
- // [, 向你共享, ，你接受并绑定设备吗？]
- whoshared = userName + splits[1] + productName + splits[splits.length - 1];
- zxingtext.setText(whoshared);
-
- String timeByFormat = DateUtil.getCurTimeByFormat("yyyy-MM-dd HH:mm:ss");
- expiredAt = DateUtil.utc2Local(expiredAt);
- long diff = DateUtil.getDiff(expiredAt, timeByFormat);
- if (diff >= 0) {
- double c = diff / 60.0;
- time = (int) Math.ceil(c);
- } else {
- tiptext.setText(getResources().getString(R.string.requestoutoftime));
- yes.setClickable(false);
- yes.setTextColor(getResources().getColor(R.color.gray));
- return;
- }
- tiptext = (TextView) findViewById(R.id.tiptext);
- tip = getResources().getString(R.string.tipthings);
- split2s = tip.split("xx");
-
- tip = split2s[0] + time + split2s[1];
-
- tiptext.setText(tip);
-
- hand.sendEmptyMessageDelayed(1, diff % 60 * 1000);
-
- yes.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- GizDeviceSharing.acceptDeviceSharingByQRCode(spf.getString("Token", ""), code);
- }
- });
-
- no.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- finish();
- }
- });
- }
-
- private void initData() {
-
- Intent intent = getIntent();
- code = intent.getStringExtra("code");
- userName = intent.getStringExtra("userName");
- productName = intent.getStringExtra("productName");
- deviceAlias = intent.getStringExtra("deviceAlias");
- expiredAt = intent.getStringExtra("expiredAt");
-
- token = spf.getString("Token", "");
-
- }
-
- @Override
- protected void onResume() {
- super.onResume();
-
- if (time > 0) {
- tip = split2s[0] + time + split2s[1];
-
- tiptext.setText(tip);
- } else {
- tiptext.setText(getResources().getString(R.string.requestoutoftime));
- yes.setClickable(false);
- yes.setTextColor(getResources().getColor(R.color.gray));
- }
-
- GizDeviceSharing.setListener(new GizDeviceSharingListener() {
-
- @Override
- public void didAcceptDeviceSharing(GizWifiErrorCode result, int sharingID) {
- super.didAcceptDeviceSharing(result, sharingID);
- if (result.ordinal() == 0) {
- finish();
- } else {
- Toast.makeText(gosZxingDeviceSharingActivity.this, toastError(result), 1).show();
- finish();
- }
- }
-
- @Override
- public void didAcceptDeviceSharingByQRCode(GizWifiErrorCode result) {
- super.didAcceptDeviceSharingByQRCode(result);
- if (result.ordinal() == 0) {
- Toast.makeText(gosZxingDeviceSharingActivity.this, "success", 1).show();
-
- finish();
- } else {
- Toast.makeText(gosZxingDeviceSharingActivity.this, toastError(result), 1).show();
-
- finish();
- }
- }
-
- @Override
- public void didCheckDeviceSharingInfoByQRCode(GizWifiErrorCode result, String userName, String productName,
- String deviceAlias, String expiredAt) {
- super.didCheckDeviceSharingInfoByQRCode(result, userName, productName, deviceAlias, expiredAt);
-
- int errorcode = result.ordinal();
-
- if (8041 <= errorcode && errorcode <= 8050 || errorcode == 8308) {
- tiptext.setVisibility(View.GONE);
- yes.setClickable(false);
- no.setClickable(false);
- yes.setTextColor(getResources().getColor(R.color.gray));
- no.setTextColor(getResources().getColor(R.color.gray));
- zxingtext.setText(getResources().getString(R.string.sorry));
- } else if (errorcode != 0) {
- tiptext.setVisibility(View.GONE);
- yes.setClickable(false);
- no.setClickable(false);
- yes.setTextColor(getResources().getColor(R.color.gray));
- no.setTextColor(getResources().getColor(R.color.gray));
- zxingtext.setText(getResources().getString(R.string.verysorry));
- } else {
- tiptext.setVisibility(View.VISIBLE);
- yes.setClickable(true);
- no.setClickable(true);
- yes.setTextColor(getResources().getColor(R.color.text_color));
- no.setTextColor(getResources().getColor(R.color.text_color));
-
- whoshared = userName + splits[1] + productName + splits[splits.length - 1];
- zxingtext.setText(whoshared);
-
- String timeByFormat = DateUtil.getCurTimeByFormat("yyyy-MM-dd HH:mm:ss");
- expiredAt = DateUtil.utc2Local(expiredAt);
- long diff = DateUtil.getDiff(expiredAt, timeByFormat);
-
- if (diff >= 0) {
- time = (int) Math.ceil(diff / 60);
- } else {
-
- }
- Toast.makeText(gosZxingDeviceSharingActivity.this, diff % 60 + "", 1).show();
-
- }
- }
- });
-
- }
-
-
- Handler hand = new Handler() {
- public void handleMessage(android.os.Message msg) {
-
- time = time - 1;
-
- if (time > 0) {
- tip = split2s[0] + time + split2s[1];
-
- tiptext.setText(tip);
- hand.sendEmptyMessageDelayed(1, 60000);
- } else {
- tiptext.setText(getResources().getString(R.string.requestoutoftime));
- yes.setClickable(false);
- yes.setTextColor(getResources().getColor(R.color.gray));
- }
-
- }
-
- ;
- };
-
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case android.R.id.home:
- this.finish();
- break;
- }
- return super.onOptionsItemSelected(item);
- }
-
-}
diff --git a/src/main/java/com/gizwits/opensource/appkit/sharingdevice/twoSharedActivity.java b/src/main/java/com/gizwits/opensource/appkit/sharingdevice/twoSharedActivity.java
deleted file mode 100644
index 8494466..0000000
--- a/src/main/java/com/gizwits/opensource/appkit/sharingdevice/twoSharedActivity.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package com.gizwits.opensource.appkit.sharingdevice;
-
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.gizwits.gizwifisdk.api.GizDeviceSharing;
-import com.gizwits.gizwifisdk.enumration.GizDeviceSharingWay;
-import com.gizwits.gizwifisdk.enumration.GizWifiErrorCode;
-import com.gizwits.gizwifisdk.listener.GizDeviceSharingListener;
-import com.gizwits.opensource.appkit.CommonModule.GosBaseActivity;
-import com.gizwits.opensource.appkit.R;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
-public class twoSharedActivity extends GosBaseActivity {
-
- private String productname;
- private String did;
- private ImageView myimage;
- private TextView timeout;
- private TextView bottomtext;
- private int time = 15;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
-
- super.onCreate(savedInstanceState);
-
- setContentView(R.layout.activity_gos_two_shared);
-
- setToolBar(true, R.string.scan_code_sharing);
-
- initData();
- initView();
- }
-
- private void initView() {
- TextView usersharedtext = (TextView) findViewById(R.id.usersharedtext);
-
- myimage = (ImageView) findViewById(R.id.myimageview);
-
- timeout = (TextView) findViewById(R.id.timeout);
-
- timeout2 = splits[0] + time + splits[1];
-
- timeout.setText(timeout2);
-
- bottomtext = (TextView) findViewById(R.id.bottomtext);
-
- usersharedtext.setText(getResources().getString(R.string.shared) + " " + productname
- + getResources().getString(R.string.friends));
- }
-
- private void initData() {
-
- Intent tent = getIntent();
- productname = tent.getStringExtra("productname");
- did = tent.getStringExtra("did");
-
- timeout2 = getResources().getString(R.string.zxingtimeout);
- splits = timeout2.split("15");
- GizDeviceSharing.sharingDevice(spf.getString("Token", ""), did, GizDeviceSharingWay.GizDeviceSharingByQRCode,
- null, null);
-
- }
-
- private void startTimer() {
- timer = new Timer();
- timer.schedule(new TimerTask() {
-
- @Override
- public void run() {
-
- time = time - 1;
- hand.sendEmptyMessage(1);
- }
- }, 60000, 60000);
- }
-
- @Override
- protected void onResume() {
- super.onResume();
- if (time > 0) {
- timeout2 = splits[0] + time + splits[1];
-
- timeout.setText(timeout2);
- } else {
- timeout.setText(getResources().getString(R.string.twofailed));
- }
- GizDeviceSharing.setListener(new GizDeviceSharingListener() {
-
- @Override
- public void didSharingDevice(GizWifiErrorCode result, String deviceID, int sharingID,
- Bitmap QRCodeImage) {
- super.didSharingDevice(result, deviceID, sharingID, QRCodeImage);
-
- if (QRCodeImage != null) {
- myimage.setImageBitmap(QRCodeImage);
- bottomtext.setVisibility(View.VISIBLE);
-
- // hand.sendEmptyMessageDelayed(1, 60000);
- startTimer();
- } else {
- int errorcode = result.ordinal();
-
- if (8041 <= errorcode && errorcode <= 8050 || errorcode == 8308) {
-
- timeout.setText(getResources().getString(R.string.twosharedtimeout));
- bottomtext.setVisibility(View.GONE);
-
- } else {
- timeout.setText(getResources().getString(R.string.sharedfailed));
- bottomtext.setVisibility(View.GONE);
- }
- }
-
- }
- });
-
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case android.R.id.home:
-
- finish();
- break;
-
- }
- return super.onOptionsItemSelected(item);
- }
-
- Handler hand = new Handler() {
- public void handleMessage(android.os.Message msg) {
-
- // time = time - 1;
-
- if (time > 0) {
- timeout2 = splits[0] + time + splits[1];
-
- timeout.setText(timeout2);
- // hand.sendEmptyMessageDelayed(1, 60000);
- } else {
- timeout.setText(getResources().getString(R.string.twofailed));
- }
-
- };
- };
-
- @Override
- protected void onDestroy() {
- // TODO Auto-generated method stub
- super.onDestroy();
-
- time = 15;
-
- hand.removeMessages(1);
- if (timer != null) {
- timer.cancel();
- }
-
- }
-
- private String timeout2;
- private String[] splits;
- private Timer timer;
-}
diff --git a/src/main/java/com/gizwits/opensource/appkit/sharingdevice/userSharedActivity.java b/src/main/java/com/gizwits/opensource/appkit/sharingdevice/userSharedActivity.java
deleted file mode 100644
index 0323389..0000000
--- a/src/main/java/com/gizwits/opensource/appkit/sharingdevice/userSharedActivity.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package com.gizwits.opensource.appkit.sharingdevice;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.graphics.Bitmap;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.gizwits.gizwifisdk.api.GizDeviceSharing;
-import com.gizwits.gizwifisdk.enumration.GizDeviceSharingWay;
-import com.gizwits.gizwifisdk.enumration.GizUserAccountType;
-import com.gizwits.gizwifisdk.enumration.GizWifiErrorCode;
-import com.gizwits.gizwifisdk.listener.GizDeviceSharingListener;
-import com.gizwits.opensource.appkit.CommonModule.GosBaseActivity;
-import com.gizwits.opensource.appkit.CommonModule.GosDeploy;
-import com.gizwits.opensource.appkit.CommonModule.TipsDialog;
-import com.gizwits.opensource.appkit.R;
-
-public class userSharedActivity extends GosBaseActivity {
-
- private String productname;
- private EditText username;
- private int chooseitem = 0;
- private String did;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- // TODO Auto-generated method stub
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_gos_user_shared);
-
- setToolBar(true, R.string.account_shared);
-
- initData();
- initView();
- }
-
- private void initView() {
- TextView usersharedtext = (TextView) findViewById(R.id.usersharedtext);
- Button button = (Button) findViewById(R.id.button);
- button.setBackgroundDrawable(GosDeploy.appConfig_BackgroundColor());
- button.setTextColor(GosDeploy.appConfig_Contrast());
-
- username = (EditText) findViewById(R.id.username);
- usersharedtext.setText(
- getResources().getString(R.string.shared) + productname + getResources().getString(R.string.friends));
- }
-
- private void initData() {
-
- Intent tent = getIntent();
- productname = tent.getStringExtra("productname");
- did = tent.getStringExtra("did");
- }
-
- public void usershared(View v) {
-
- final String usernametext = username.getText().toString();
- if (TextUtils.isEmpty(usernametext)) {
-
- // Toast.makeText(this,
- // getResources().getString(R.string.toast_name_empet), 0).show();
-
- TipsDialog dia = new TipsDialog(this, getResources().getString(R.string.toast_name_empet));
- dia.show();
- return;
- }
-
- SharedPreferences spf = getSharedPreferences("set", Context.MODE_PRIVATE);
- String token = spf.getString("Token", "");
- if (usernametext.length() < 32) {
- if (usernametext.matches("[0-9]+")) {
- GizDeviceSharing.sharingDevice(token, did, GizDeviceSharingWay.GizDeviceSharingByNormal, usernametext,
- GizUserAccountType.GizUserPhone);
- return;
- }
-
- }
- if (usernametext.contains("@")) {
- GizDeviceSharing.sharingDevice(token, did, GizDeviceSharingWay.GizDeviceSharingByNormal, usernametext,
- GizUserAccountType.GizUserEmail);
- return;
- }
- if (usernametext.length() == 32) {
- if (usernametext.matches("[a-zA-Z0-9]+")) {
- GizDeviceSharing.sharingDevice(token, did, GizDeviceSharingWay.GizDeviceSharingByNormal, usernametext,
- GizUserAccountType.GizUserOther);
- return;
- }
-
- }
- Toast.makeText(this, getString(R.string.account_incorrect), Toast.LENGTH_LONG).show();
-
-
- }
-
- @Override
- protected void onResume() {
- super.onResume();
-
- GizDeviceSharing.setListener(new GizDeviceSharingListener() {
-
- @Override
- public void didSharingDevice(GizWifiErrorCode result, String deviceID, int sharingID,
- Bitmap QRCodeImage) {
- super.didSharingDevice(result, deviceID, sharingID, QRCodeImage);
-
- if (result.ordinal() == 0) {
- Toast.makeText(userSharedActivity.this, getResources().getString(R.string.alawyssend), 1).show();
- finish();
- } else if (result == GizWifiErrorCode.GIZ_OPENAPI_GUEST_ALREADY_BOUND) {
- Toast.makeText(userSharedActivity.this, getResources().getString(R.string.account_shared2), toastTime).show();
- } else if (result == GizWifiErrorCode.GIZ_OPENAPI_NOT_FOUND_GUEST) {
- Toast.makeText(userSharedActivity.this, getResources().getString(R.string.user_not_exist), toastTime).show();
- } else if (result == GizWifiErrorCode.GIZ_OPENAPI_CANNOT_SHARE_TO_SELF) {
- Toast.makeText(userSharedActivity.this, getResources().getString(R.string.not_shared_self), toastTime).show();
- } else {
- Toast.makeText(userSharedActivity.this, getResources().getString(R.string.send_failed1), 2).show();
- }
-
- }
-
- });
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case android.R.id.home:
-
- finish();
- break;
-
- }
- return super.onOptionsItemSelected(item);
- }
-
-}
diff --git a/src/main/java/com/gizwits/opensource/appkit/utils/.DS_Store b/src/main/java/com/gizwits/opensource/appkit/utils/.DS_Store
deleted file mode 100644
index 69a3990..0000000
Binary files a/src/main/java/com/gizwits/opensource/appkit/utils/.DS_Store and /dev/null differ
diff --git a/src/main/java/com/gizwits/opensource/appkit/utils/AssetsUtils.java b/src/main/java/com/gizwits/opensource/appkit/utils/AssetsUtils.java
deleted file mode 100644
index 62bcabe..0000000
--- a/src/main/java/com/gizwits/opensource/appkit/utils/AssetsUtils.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.gizwits.opensource.appkit.utils;
-
-import android.content.Context;
-import android.util.DisplayMetrics;
-import android.view.WindowManager;
-
-import com.gizwits.opensource.appkit.CommonModule.GosDeploy;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Locale;
-
-public class AssetsUtils {
-
- public static void assetsDataToSD(String fileOutPutName,
- String fileInPutName, Context context) throws IOException {
- InputStream myInput;
- File file = new File(fileOutPutName);
- if (!file.exists()) {
- file.createNewFile();
- }else {
- return;
- }
- OutputStream myOutput = new FileOutputStream(fileOutPutName);
- myInput = context.getAssets().open(fileInPutName);
- byte[] buffer = new byte[1024];
- int length = myInput.read(buffer);
- while (length > 0) {
- myOutput.write(buffer, 0, length);
- length = myInput.read(buffer);
- }
-
- myOutput.flush();
- myInput.close();
- myOutput.close();
- }
-
-
-
- public static void saveFile(String str) {
- String filePath = null;
-
-
- filePath = GosDeploy.fileOutName;
- try {
- if(filePath!=null){
- File file = new File(filePath);
- if (!file.exists()) {
- File dir = new File(file.getParent());
- dir.mkdirs();
- file.createNewFile();
- }
- FileOutputStream outStream = new FileOutputStream(file);
- outStream.write(str.getBytes());
- outStream.close();
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- }
-}
- /**
- * 将dip或dp值转换为px值，保证尺寸大小不变
- *
- * @param dipValue
- * @param scale
- * （DisplayMetrics类中属性density）
- * @return
- */
- public static int diptopx(Context context, float dipValue) {
- final float scale = context.getResources().getDisplayMetrics().density;
- return (int) (dipValue * scale + 0.5f);
- }
-
-
- /**
- * 将sp值转换为px值，保证文字大小不变
- *
- * @param spValue
- * @param fontScale
- * （DisplayMetrics类中属性scaledDensity）
- * @return
- */
- public static int sptopx(Context context, float spValue) {
- final float fontScale = context.getResources().getDisplayMetrics().scaledDensity;
- return (int) (spValue * fontScale + 0.5f);
- }
-
- public static boolean isZh(Context context) {
- Locale locale = context.getResources().getConfiguration().locale;
- String language = locale.getLanguage();
- if (language.endsWith("zh"))
- return true;
- else
- return false;
- }
-
- public static int getScreenWidth(Context context)
- {
- WindowManager wm = (WindowManager) context
- .getSystemService(Context.WINDOW_SERVICE );
- DisplayMetrics outMetrics = new DisplayMetrics();
- wm.getDefaultDisplay().getMetrics( outMetrics);
- return outMetrics .widthPixels ;
- }
-
-
-}
diff --git a/src/main/java/com/gizwits/opensource/appkit/utils/DateUtil.java b/src/main/java/com/gizwits/opensource/appkit/utils/DateUtil.java
deleted file mode 100644
index a347d0e..0000000
--- a/src/main/java/com/gizwits/opensource/appkit/utils/DateUtil.java
+++ /dev/null
@@ -1,1331 +0,0 @@
-package com.gizwits.opensource.appkit.utils;
-
-import android.annotation.SuppressLint;
-
-import java.io.Serializable;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.ParsePosition;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.TimeZone;
-
-/**
- * 日期操作工具类，主要实现了日期的常用操作。
- *
- * 在工具类中经常使用到工具类的格式化描述，这个主要是一个日期的操作类，所以日志格式主要使用 SimpleDateFormat的定义格式.
- *
- * 格式的意义如下： 日期和时间模式
- * 日期和时间格式由日期和时间模式字符串指定。在日期和时间模式字符串中，未加引号的字母 'A' 到 'Z' 和 'a' 到 'z'
- * 被解释为模式字母，用来表示日期或时间字符串元素。文本可以使用单引号 (') 引起来，以免进行解释。"''"
- * 表示单引号。所有其他字符均不解释；只是在格式化时将它们简单复制到输出字符串，或者在分析时与输入字符串进行匹配。
- *
- * 定义了以下模式字母（所有其他字符 'A' 到 'Z' 和 'a' 到 'z' 都被保留）：
- *
- *
- * | 字母 |
- * 日期或时间元素 |
- * 表示 |
- * 示例 |
- *
- * |
- *
- * | G |
- * Era |
- * 标志符 |
- * Text |
- * AD |
- *
- * |
- *
- * | y |
- * 年 |
- * Year |
- * 1996; |
- * 96 |
- *
- * |
- *
- * | M |
- * 年中的月份 |
- * Month |
- * July; |
- * Jul; |
- * 07
- * |
- *
- * | w |
- * 年中的周数 |
- * Number |
- * 27 |
- *
- * |
- *
- * | W |
- * 月份中的周数 |
- * Number |
- * 2 |
- *
- * |
- *
- * | D |
- * 年中的天数 |
- * Number |
- * 189 |
- *
- * |
- *
- * | d |
- * 月份中的天数 |
- * Number |
- * 10 |
- *
- * |
- *
- * | F |
- * 月份中的星期 |
- * Number |
- * 2 |
- *
- * |
- *
- * | E |
- * 星期中的天数 |
- * Text |
- * Tuesday; |
- * Tue
- * |
- *
- * | a |
- * Am/pm |
- * 标记 |
- * Text |
- * PM |
- *
- * |
- *
- * | H |
- * 一天中的小时数（0-23） |
- * Number |
- * 0
- * |
- *
- * | k |
- * 一天中的小时数（1-24） |
- * Number |
- * 24 |
- *
- * |
- *
- * | K |
- * am/pm |
- * 中的小时数（0-11） |
- * Number |
- * 0 |
- *
- * |
- *
- * | h |
- * am/pm |
- * 中的小时数（1-12） |
- * Number |
- * 12 |
- *
- * |
- *
- * | m |
- * 小时中的分钟数 |
- * Number |
- * 30 |
- *
- * |
- *
- * | s |
- * 分钟中的秒数 |
- * Number |
- * 55 |
- *
- * |
- *
- * | S |
- * 毫秒数 |
- * Number |
- * 978 |
- *
- * |
- *
- * | z |
- * 时区 |
- * General |
- * time |
- * zone |
- * Pacific |
- * Standard |
- * Time; |
- * PST; |
- * GMT-08:00
- * |
- *
- * | Z |
- * 时区 |
- * RFC |
- * 822 |
- * time |
- * zone |
- * -0800 |
- *
- * |
- *
- *
- * 模式字母通常是重复的，其数量确定其精确表示：
- *
- */
-public final class DateUtil implements Serializable {
- /**
- *
- */
- private static final long serialVersionUID = -3098985139095632110L;
-
- private DateUtil() {
- }
-
- /**
- * 格式化日期显示格式yyyy-MM-dd
- *
- * @param sdate
- * 原始日期格式
- * @return yyyy-MM-dd格式化后的日期显示
- */
- public static String dateFormat(String sdate) {
- return dateFormat(sdate, "yyyy-MM-dd");
- }
-
- /**
- * 格式化日期显示格式
- *
- * @param sdate
- * 原始日期格式
- * @param format
- * 格式化后日期格式
- * @return 格式化后的日期显示
- */
- public static String dateFormat(String sdate, String format) {
- SimpleDateFormat formatter = new SimpleDateFormat(format);
- java.sql.Date date = java.sql.Date.valueOf(sdate);
- String dateString = formatter.format(date);
-
- return dateString;
- }
-
- /**
- * 求两个日期相差天数
- *
- * @param sd
- * 起始日期，格式yyyy-MM-dd
- * @param ed
- * 终止日期，格式yyyy-MM-dd
- * @return 两个日期相差天数
- */
- public static long getIntervalDays(String sd, String ed) {
- return ((java.sql.Date.valueOf(ed)).getTime() - (java.sql.Date.valueOf(sd)).getTime()) / (3600 * 24 * 1000);
- }
-
- /**
- * 起始年月yyyy-MM与终止月yyyy-MM之间跨度的月数
- *
- * @return int
- */
- public static int getInterval(String beginMonth, String endMonth) {
- int intBeginYear = Integer.parseInt(beginMonth.substring(0, 4));
- int intBeginMonth = Integer.parseInt(beginMonth.substring(beginMonth.indexOf("-") + 1));
- int intEndYear = Integer.parseInt(endMonth.substring(0, 4));
- int intEndMonth = Integer.parseInt(endMonth.substring(endMonth.indexOf("-") + 1));
-
- return ((intEndYear - intBeginYear) * 12) + (intEndMonth - intBeginMonth) + 1;
- }
-
- public static Date getDate(String sDate, String dateFormat) {
- SimpleDateFormat fmt = new SimpleDateFormat(dateFormat);
- ParsePosition pos = new ParsePosition(0);
-
- return fmt.parse(sDate, pos);
- }
-
- /**
- * 取得当前日期的年份，以yyyy格式返回.
- *
- * @return 当年 yyyy
- */
- public static String getCurrentYear() {
- return getFormatCurrentTime("yyyy");
- }
-
- /**
- * 自动返回上一年。例如当前年份是2007年，那么就自动返回2006
- *
- * @return 返回结果的格式为 yyyy
- */
- public static String getBeforeYear() {
- String currentYear = getFormatCurrentTime("yyyy");
- int beforeYear = Integer.parseInt(currentYear) - 1;
- return "" + beforeYear;
- }
-
- /**
- * 取得当前日期的月份，以MM格式返回.
- *
- * @return 当前月份 MM
- */
- public static String getCurrentMonth() {
- return getFormatCurrentTime("MM");
- }
-
- /**
- * 取得当前日期的天数，以格式"dd"返回.
- *
- * @return 当前月中的某天dd
- */
- public static String getCurrentDay() {
- return getFormatCurrentTime("dd");
- }
-
- /**
- * 返回当前时间字符串。
- *
- * 格式：yyyy-MM-dd
- *
- * @return String 指定格式的日期字符串.
- */
- public static String getCurrentDate() {
- return getFormatDateTime(new Date(), "yyyy-MM-dd");
- }
-
- /**
- * 返回给定时间字符串。
- *
- * 格式：yyyy-MM-dd
- *
- * @param date
- * 日期
- * @return String 指定格式的日期字符串.
- */
- public static String getFormatDate(Date date) {
- return getFormatDateTime(date, "yyyy-MM-dd");
- }
-
- /**
- * 根据制定的格式，返回日期字符串。例如2007-05-05
- *
- * @param format
- * "yyyy-MM-dd" 或者 "yyyy/MM/dd"
- * @return 指定格式的日期字符串。
- */
- public static String getFormatDate(String format) {
- return getFormatDateTime(new Date(), format);
- }
-
- /**
- * 返回当前时间字符串。
- *
- * 格式：yyyy-MM-dd HH:mm:ss
- *
- * @return String 指定格式的日期字符串.
- */
- public static String getCurrentTime() {
- return getFormatDateTime(new Date(), "yyyy-MM-dd HH:mm:ss");
- }
-
- /**
- * 返回给定时间字符串。
- *
- * 格式：yyyy-MM-dd HH:mm:ss
- *
- * @param date
- * 日期
- * @return String 指定格式的日期字符串.
- */
- public static String getFormatTime(Date date) {
- return getFormatDateTime(date, "yyyy-MM-dd HH:mm:ss");
- }
-
- /**
- * 根据给定的格式，返回时间字符串。
- *
- * 格式参照类描绘中说明.
- *
- * @param format
- * 日期格式字符串
- * @return String 指定格式的日期字符串.
- */
- public static String getFormatCurrentTime(String format) {
- return getFormatDateTime(new Date(), format);
- }
-
- /**
- * 根据给定的格式与时间(Date类型的)，返回时间字符串
- *
- * @param date
- * 指定的日期
- * @param format
- * 日期格式字符串
- * @return String 指定格式的日期字符串.
- */
- public static String getFormatDateTime(Date date, String format) {
- SimpleDateFormat sdf = new SimpleDateFormat(format);
- return sdf.format(date);
- }
-
- /**
- * 取得指定年月日的日期对象.
- *
- * @param year
- * 年
- * @param month
- * 月注意是从1到12
- * @param day
- * 日
- * @return 一个java.util.Date()类型的对象
- */
- public static Date getDateObj(int year, int month, int day) {
- Calendar c = new GregorianCalendar();
- c.set(year, month - 1, day);
- return c.getTime();
- }
-
- /**
- * 取得指定分隔符分割的年月日的日期对象.
- *
- * @param args
- * 格式为"yyyy-MM-dd"
- * @param split
- * 时间格式的间隔符，例如“-”，“/”
- * @return 一个java.util.Date()类型的对象
- */
- public static Date getDateObj(String args, String split) {
- String[] temp = args.split(split);
- int year = new Integer(temp[0]).intValue();
- int month = new Integer(temp[1]).intValue();
- int day = new Integer(temp[2]).intValue();
- return getDateObj(year, month, day);
- }
-
- /**
- * 取得给定字符串描述的日期对象，描述模式采用pattern指定的格式.
- *
- * @param dateStr
- * 日期描述
- * @param pattern
- * 日期模式
- * @return 给定字符串描述的日期对象。
- */
- public static Date getDateFromString(String dateStr, String pattern) {
- SimpleDateFormat sdf = new SimpleDateFormat(pattern);
- Date resDate = null;
- try {
- resDate = sdf.parse(dateStr);
- } catch (Exception e) {
- e.printStackTrace();
- }
- return resDate;
- }
-
- /**
- * 取得当前Date对象.
- *
- * @return Date 当前Date对象.
- */
- public static Date getDateObj() {
- Calendar c = new GregorianCalendar();
- return c.getTime();
- }
-
- /**
- *
- * @return 当前月份有多少天；
- */
- public static int getDaysOfCurMonth() {
- int curyear = new Integer(getCurrentYear()).intValue(); // 当前年份
- int curMonth = new Integer(getCurrentMonth()).intValue();// 当前月份
- int mArray[] = new int[] { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
- // 判断闰年的情况 ，2月份有29天；
- if ((curyear % 400 == 0) || ((curyear % 100 != 0) && (curyear % 4 == 0))) {
- mArray[1] = 29;
- }
- return mArray[curMonth - 1];
- // 如果要返回下个月的天数，注意处理月份12的情况，防止数组越界；
- // 如果要返回上个月的天数，注意处理月份1的情况，防止数组越界；
- }
-
- /**
- * 根据指定的年月 返回指定月份（yyyy-MM）有多少天。
- *
- * @param time
- * yyyy-MM
- * @return 天数，指定月份的天数。
- */
- public static int getDaysOfCurMonth(final String time) {
- String[] timeArray = time.split("-");
- int curyear = new Integer(timeArray[0]).intValue(); // 当前年份
- int curMonth = new Integer(timeArray[1]).intValue();// 当前月份
- int mArray[] = new int[] { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
- // 判断闰年的情况 ，2月份有29天；
- if ((curyear % 400 == 0) || ((curyear % 100 != 0) && (curyear % 4 == 0))) {
- mArray[1] = 29;
- }
- if (curMonth == 12) {
- return mArray[0];
- }
- return mArray[curMonth - 1];
- // 如果要返回下个月的天数，注意处理月份12的情况，防止数组越界；
- // 如果要返回上个月的天数，注意处理月份1的情况，防止数组越界；
- }
-
- /**
- * 返回指定为年度为year月度为month的月份内，第weekOfMonth个星期的第dayOfWeek天。
- * 00 00 00 01 02 03 04
- * 05 06 07 08 09 10 11
- * 12 13 14 15 16 17 18
- * 19 20 21 22 23 24 25
- * 26 27 28 29 30 31
- * 2006年的第一个周的1到7天为：05 06 07 01 02 03 04
- * 2006年的第二个周的1到7天为：12 13 14 08 09 10 11
- * 2006年的第三个周的1到7天为：19 20 21 15 16 17 18
- * 2006年的第四个周的1到7天为：26 27 28 22 23 24 25
- * 2006年的第五个周的1到7天为：02 03 04 29 30 31 01 。本月没有就自动转到下个月了。
- *
- * @param year
- * 形式为yyyy
- * @param month
- * 形式为MM,参数值在[1-12]。
- * @param weekOfMonth
- * 在[1-6],因为一个月最多有6个周。
- * @param dayOfWeek
- * 数字在1到7之间，包括1和7。1表示星期天，7表示星期六
- * -6为星期日-1为星期五，0为星期六
- * @return int
- */
- public static int getDayofWeekInMonth(String year, String month, String weekOfMonth, String dayOfWeek) {
- Calendar cal = new GregorianCalendar();
- // 在具有默认语言环境的默认时区内使用当前时间构造一个默认的 GregorianCalendar。
- int y = new Integer(year).intValue();
- int m = new Integer(month).intValue();
- cal.clear();// 不保留以前的设置
- cal.set(y, m - 1, 1);// 将日期设置为本月的第一天。
- cal.set(Calendar.DAY_OF_WEEK_IN_MONTH, new Integer(weekOfMonth).intValue());
- cal.set(Calendar.DAY_OF_WEEK, new Integer(dayOfWeek).intValue());
- // System.out.print(cal.get(Calendar.MONTH)+" ");
- // System.out.print("当"+cal.get(Calendar.WEEK_OF_MONTH)+"\t");
- // WEEK_OF_MONTH表示当天在本月的第几个周。不管1号是星期几，都表示在本月的第一个周
- return cal.get(Calendar.DAY_OF_MONTH);
- }
-
- /**
- * 根据指定的年月日小时分秒，返回一个java.Util.Date对象。
- *
- * @param year
- * 年
- * @param month
- * 月 0-11
- * @param date
- * 日
- * @param hourOfDay
- * 小时 0-23
- * @param minute
- * 分 0-59
- * @param second
- * 秒 0-59
- * @return 一个Date对象。
- */
- public static Date getDate(int year, int month, int date, int hourOfDay, int minute, int second) {
- Calendar cal = new GregorianCalendar();
- cal.set(year, month, date, hourOfDay, minute, second);
- return cal.getTime();
- }
-
- /**
- * 根据指定的年、月、日返回当前是星期几。1表示星期天、2表示星期一、7表示星期六。
- *
- * @param year
- * @param month
- * month是从1开始的12结束
- * @param day
- * @return 返回一个代表当期日期是星期几的数字。1表示星期天、2表示星期一、7表示星期六。
- */
- public static int getDayOfWeek(String year, String month, String day) {
- Calendar cal = new GregorianCalendar(new Integer(year).intValue(), new Integer(month).intValue() - 1,
- new Integer(day).intValue());
- return cal.get(Calendar.DAY_OF_WEEK);
- }
-
- /**
- * 根据指定的年、月、日返回当前是星期几。1表示星期天、2表示星期一、7表示星期六。
- *
- * @param date
- * "yyyy/MM/dd",或者"yyyy-MM-dd"
- * @return 返回一个代表当期日期是星期几的数字。1表示星期天、2表示星期一、7表示星期六。
- */
- public static int getDayOfWeek(String date) {
- String[] temp = null;
- if (date.indexOf("/") > 0) {
- temp = date.split("/");
- }
- if (date.indexOf("-") > 0) {
- temp = date.split("-");
- }
- return getDayOfWeek(temp[0], temp[1], temp[2]);
- }
-
- /**
- * 返回当前日期是星期几。例如：星期日、星期一、星期六等等。
- *
- * @param date
- * 格式为 yyyy/MM/dd 或者 yyyy-MM-dd
- * @return 返回当前日期是星期几
- */
- public static String getChinaDayOfWeek(String date) {
- String[] weeks = new String[] { "星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六" };
- int week = getDayOfWeek(date);
- return weeks[week - 1];
- }
-
- /**
- * 根据指定的年、月、日返回当前是星期几。1表示星期天、2表示星期一、7表示星期六。
- *
- * @param date
- *
- * @return 返回一个代表当期日期是星期几的数字。1表示星期天、2表示星期一、7表示星期六。
- */
- public static int getDayOfWeek(Date date) {
- Calendar cal = new GregorianCalendar();
- cal.setTime(date);
- return cal.get(Calendar.DAY_OF_WEEK);
- }
-
- /**
- * 返回制定日期所在的周是一年中的第几个周。
- * created by wangmj at 20060324.
- *
- * @param year
- * @param month
- * 范围1-12
- * @param day
- * @return int
- */
- public static int getWeekOfYear(String year, String month, String day) {
- Calendar cal = new GregorianCalendar();
- cal.clear();
- cal.set(new Integer(year).intValue(), new Integer(month).intValue() - 1, new Integer(day).intValue());
- return cal.get(Calendar.WEEK_OF_YEAR);
- }
-
- /**
- * 取得给定日期加上一定天数后的日期对象.
- *
- * @param date
- * 给定的日期对象
- * @param amount
- * 需要添加的天数，如果是向前的天数，使用负数就可以.
- * @return Date 加上一定天数以后的Date对象.
- */
- public static Date getDateAdd(Date date, int amount) {
- Calendar cal = new GregorianCalendar();
- cal.setTime(date);
- cal.add(GregorianCalendar.DATE, amount);
- return cal.getTime();
- }
-
- /**
- * 取得给定日期加上一定天数后的日期对象.
- *
- * @param date
- * 给定的日期对象
- * @param amount
- * 需要添加的天数，如果是向前的天数，使用负数就可以.
- * @param format
- * 输出格式.
- * @return Date 加上一定天数以后的Date对象.
- */
- public static String getFormatDateAdd(Date date, int amount, String format) {
- Calendar cal = new GregorianCalendar();
- cal.setTime(date);
- cal.add(GregorianCalendar.DATE, amount);
- return getFormatDateTime(cal.getTime(), format);
- }
-
- /**
- * 获得当前日期固定间隔天数的日期，如前60天dateAdd(-60)
- *
- * @param amount
- * 距今天的间隔日期长度，向前为负，向后为正
- * @param format
- * 输出日期的格式.
- * @return java.lang.String 按照格式输出的间隔的日期字符串.
- */
- public static String getFormatCurrentAdd(int amount, String format) {
-
- Date d = getDateAdd(new Date(), amount);
-
- return getFormatDateTime(d, format);
- }
-
- /**
- * 取得给定格式的昨天的日期输出
- *
- * @param format
- * 日期输出的格式
- * @return String 给定格式的日期字符串.
- */
- public static String getFormatYestoday(String format) {
- return getFormatCurrentAdd(-1, format);
- }
-
- /**
- * 返回指定日期的前一天。
- *
- * @param sourceDate
- * @param format
- * yyyy MM dd hh mm ss
- * @return 返回日期字符串，形式和formcat一致。
- */
- public static String getYestoday(String sourceDate, String format) {
- return getFormatDateAdd(getDateFromString(sourceDate, format), -1, format);
- }
-
- /**
- * 返回明天的日期，
- *
- * @param format
- * @return 返回日期字符串，形式和formcat一致。
- */
- public static String getFormatTomorrow(String format) {
- return getFormatCurrentAdd(1, format);
- }
-
- /**
- * 返回指定日期的后一天。
- *
- * @param sourceDate
- * @param format
- * @return 返回日期字符串，形式和formcat一致。
- */
- public static String getFormatDateTommorrow(String sourceDate, String format) {
- return getFormatDateAdd(getDateFromString(sourceDate, format), 1, format);
- }
-
- /**
- * 根据主机的默认 TimeZone，来获得指定形式的时间字符串。
- *
- * @param dateFormat
- * @return 返回日期字符串，形式和formcat一致。
- */
- public static String getCurrentDateString(String dateFormat) {
- Calendar cal = Calendar.getInstance(TimeZone.getDefault());
- SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
- sdf.setTimeZone(TimeZone.getDefault());
-
- return sdf.format(cal.getTime());
- }
-
- /**
- * @deprecated 不鼓励使用。 返回当前时间串 格式:yyMMddhhmmss,在上传附件时使用
- *
- * @return String
- */
- public static String getCurDate() {
- GregorianCalendar gcDate = new GregorianCalendar();
- int year = gcDate.get(GregorianCalendar.YEAR);
- int month = gcDate.get(GregorianCalendar.MONTH) + 1;
- int day = gcDate.get(GregorianCalendar.DAY_OF_MONTH);
- int hour = gcDate.get(GregorianCalendar.HOUR_OF_DAY);
- int minute = gcDate.get(GregorianCalendar.MINUTE);
- int sen = gcDate.get(GregorianCalendar.SECOND);
- String y;
- String m;
- String d;
- String h;
- String n;
- String s;
- y = new Integer(year).toString();
-
- if (month < 10) {
- m = "0" + new Integer(month).toString();
- } else {
- m = new Integer(month).toString();
- }
-
- if (day < 10) {
- d = "0" + new Integer(day).toString();
- } else {
- d = new Integer(day).toString();
- }
-
- if (hour < 10) {
- h = "0" + new Integer(hour).toString();
- } else {
- h = new Integer(hour).toString();
- }
-
- if (minute < 10) {
- n = "0" + new Integer(minute).toString();
- } else {
- n = new Integer(minute).toString();
- }
-
- if (sen < 10) {
- s = "0" + new Integer(sen).toString();
- } else {
- s = new Integer(sen).toString();
- }
-
- return "" + y + m + d + h + n + s;
- }
-
- /**
- * 根据给定的格式，返回时间字符串。 和getFormatDate(String format)相似。
- *
- * @param format
- * yyyy MM dd hh mm ss
- * @return 返回一个时间字符串
- */
- public static String getCurTimeByFormat(String format) {
- Date newdate = new Date(System.currentTimeMillis());
- SimpleDateFormat sdf = new SimpleDateFormat(format);
- return sdf.format(newdate);
- }
-
- /**
- * 获取两个时间串时间的差值，单位为秒
- *
- * @param startTime
- * 开始时间 yyyy-MM-dd HH:mm:ss
- * @param endTime
- * 结束时间 yyyy-MM-dd HH:mm:ss
- * @return 两个时间的差值(秒)
- */
- public static long getDiff(String startTime, String endTime) {
- long diff = 0;
- SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- try {
- Date startDate = ft.parse(startTime);
- Date endDate = ft.parse(endTime);
- diff = startDate.getTime() - endDate.getTime();
- diff = diff / 1000;
- } catch (ParseException e) {
- e.printStackTrace();
- }
- return diff;
- }
-
- /**
- * 获取小时/分钟/秒
- *
- * @param second
- * 秒
- * @return 包含小时、分钟、秒的时间字符串，例如3小时23分钟13秒。
- */
- public static String getHour(long second) {
- long hour = second / 60 / 60;
- long minute = (second - hour * 60 * 60) / 60;
- long sec = (second - hour * 60 * 60) - minute * 60;
-
- return hour + "小时" + minute + "分钟" + sec + "秒";
-
- }
-
- /**
- * 返回指定时间字符串。
- *
- * 格式：yyyy-MM-dd HH:mm:ss
- *
- * @return String 指定格式的日期字符串.
- */
- public static String getDateTime(long microsecond) {
- return getFormatDateTime(new Date(microsecond), "yyyy-MM-dd HH:mm:ss");
- }
-
- /**
- * 返回当前时间加实数小时后的日期时间。
- *
- * 格式：yyyy-MM-dd HH:mm:ss
- *
- * @return Float 加几实数小时.
- */
- public static String getDateByAddFltHour(float flt) {
- int addMinute = (int) (flt * 60);
- Calendar cal = new GregorianCalendar();
- cal.setTime(new Date());
- cal.add(GregorianCalendar.MINUTE, addMinute);
- return getFormatDateTime(cal.getTime(), "yyyy-MM-dd HH:mm:ss");
- }
-
- /**
- * 返回指定时间加指定小时数后的日期时间。
- *
- * 格式：yyyy-MM-dd HH:mm:ss
- *
- * @return 时间.
- */
- public static String getDateByAddHour(String datetime, int minute) {
- String returnTime = null;
- Calendar cal = new GregorianCalendar();
- SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- Date date;
- try {
- date = ft.parse(datetime);
- cal.setTime(date);
- cal.add(GregorianCalendar.MINUTE, minute);
- returnTime = getFormatDateTime(cal.getTime(), "yyyy-MM-dd HH:mm:ss");
- } catch (ParseException e) {
- e.printStackTrace();
- }
- return returnTime;
-
- }
-
- /**
- * 获取两个时间串时间的差值，单位为小时
- *
- * @param startTime
- * 开始时间 yyyy-MM-dd HH:mm:ss
- * @param endTime
- * 结束时间 yyyy-MM-dd HH:mm:ss
- * @return 两个时间的差值(秒)
- */
- public static int getDiffHour(String startTime, String endTime) {
- long diff = 0;
- SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- try {
- Date startDate = ft.parse(startTime);
- Date endDate = ft.parse(endTime);
- diff = startDate.getTime() - endDate.getTime();
- diff = diff / (1000 * 60 * 60);
- } catch (ParseException e) {
- e.printStackTrace();
- }
- return new Long(diff).intValue();
- }
-
- /**
- * 返回年份的下拉框。
- *
- * @param selectName
- * 下拉框名称
- * @param value
- * 当前下拉框的值
- * @param startYear
- * 开始年份
- * @param endYear
- * 结束年份
- * @return 年份下拉框的html
- */
- public static String getYearSelect(String selectName, String value, int startYear, int endYear) {
- int start = startYear;
- int end = endYear;
- if (startYear > endYear) {
- start = endYear;
- end = startYear;
- }
- StringBuffer sb = new StringBuffer("");
- sb.append("");
- return sb.toString();
- }
-
- /**
- * 返回年份的下拉框。
- *
- * @param selectName
- * 下拉框名称
- * @param value
- * 当前下拉框的值
- * @param startYear
- * 开始年份
- * @param endYear
- * 结束年份
- * 例如开始年份为2001结束年份为2005那么下拉框就有五个值。（2001、2002、2003、2004、2005）。
- * @return 返回年份的下拉框的html。
- */
- public static String getYearSelect(String selectName, String value, int startYear, int endYear, boolean hasBlank) {
- int start = startYear;
- int end = endYear;
- if (startYear > endYear) {
- start = endYear;
- end = startYear;
- }
- StringBuffer sb = new StringBuffer("");
- sb.append("");
- return sb.toString();
- }
-
- /**
- * 返回年份的下拉框。
- *
- * @param selectName
- * 下拉框名称
- * @param value
- * 当前下拉框的值
- * @param startYear
- * 开始年份
- * @param endYear
- * 结束年份
- * @param js
- * 这里的js为js字符串。例如 " onchange=\"changeYear()\" "
- * ,这样任何js的方法就可以在jsp页面中编写，方便引入。
- * @return 返回年份的下拉框。
- */
- public static String getYearSelect(String selectName, String value, int startYear, int endYear, boolean hasBlank,
- String js) {
- int start = startYear;
- int end = endYear;
- if (startYear > endYear) {
- start = endYear;
- end = startYear;
- }
- StringBuffer sb = new StringBuffer("");
-
- sb.append("");
- return sb.toString();
- }
-
- /**
- * 返回年份的下拉框。
- *
- * @param selectName
- * 下拉框名称
- * @param value
- * 当前下拉框的值
- * @param startYear
- * 开始年份
- * @param endYear
- * 结束年份
- * @param js
- * 这里的js为js字符串。例如 " onchange=\"changeYear()\" "
- * ,这样任何js的方法就可以在jsp页面中编写，方便引入。
- * @return 返回年份的下拉框。
- */
- public static String getYearSelect(String selectName, String value, int startYear, int endYear, String js) {
- int start = startYear;
- int end = endYear;
- if (startYear > endYear) {
- start = endYear;
- end = startYear;
- }
- StringBuffer sb = new StringBuffer("");
- sb.append("");
- return sb.toString();
- }
-
- /**
- * 获取月份的下拉框
- *
- * @param selectName
- * @param value
- * @param hasBlank
- * @return 返回月份的下拉框。
- */
- public static String getMonthSelect(String selectName, String value, boolean hasBlank) {
- StringBuffer sb = new StringBuffer("");
- sb.append("");
- return sb.toString();
- }
-
- /**
- * 获取月份的下拉框
- *
- * @param selectName
- * @param value
- * @param hasBlank
- * @param js
- * @return 返回月份的下拉框。
- */
- public static String getMonthSelect(String selectName, String value, boolean hasBlank, String js) {
- StringBuffer sb = new StringBuffer("");
- sb.append("");
- return sb.toString();
- }
-
- /**
- * 获取天的下拉框，默认的为1-31。 注意：此方法不能够和月份下拉框进行联动。
- *
- * @param selectName
- * @param value
- * @param hasBlank
- * @return 获得天的下拉框
- */
- public static String getDaySelect(String selectName, String value, boolean hasBlank) {
- StringBuffer sb = new StringBuffer("");
- sb.append("");
- return sb.toString();
- }
-
- /**
- * 获取天的下拉框，默认的为1-31
- *
- * @param selectName
- * @param value
- * @param hasBlank
- * @param js
- * @return 获取天的下拉框
- */
- public static String getDaySelect(String selectName, String value, boolean hasBlank, String js) {
- StringBuffer sb = new StringBuffer("");
- sb.append("");
- return sb.toString();
- }
-
- /**
- * 计算两天之间有多少个周末（这个周末，指星期六和星期天，一个周末返回结果为2，两个为4，以此类推。） （此方法目前用于统计司机用车记录。）
- *
- * @param startDate
- * 开始日期 ，格式"yyyy/MM/dd"
- * @param endDate
- * 结束日期 ，格式"yyyy/MM/dd"
- * @return int
- */
- public static int countWeekend(String startDate, String endDate) {
- int result = 0;
- Date sdate = null;
- Date edate = null;
- sdate = getDateObj(startDate, "/"); // 开始日期
- edate = getDateObj(endDate, "/");// 结束日期
- // 首先计算出都有那些日期，然后找出星期六星期天的日期
- int sumDays = Math.abs(getDiffDays(startDate, endDate));
- int dayOfWeek = 0;
- for (int i = 0; i <= sumDays; i++) {
- dayOfWeek = getDayOfWeek(getDateAdd(sdate, i)); // 计算每过一天的日期
- if (dayOfWeek == 1 || dayOfWeek == 7) { // 1 星期天 7星期六
- result++;
- }
- }
- return result;
- }
-
- /**
- * 返回两个日期之间相差多少天。
- *
- * @param startDate
- * 格式"yyyy/MM/dd"
- * @param endDate
- * 格式"yyyy/MM/dd"
- * @return 整数。
- */
- public static int getDiffDays(String startDate, String endDate) {
- long diff = 0;
- SimpleDateFormat ft = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
- try {
- Date sDate = ft.parse(startDate + " 00:00:00");
- Date eDate = ft.parse(endDate + " 00:00:00");
- diff = eDate.getTime() - sDate.getTime();
- diff = diff / 86400000;// 1000*60*60*24;
- } catch (ParseException e) {
- e.printStackTrace();
- }
- return (int) diff;
-
- }
-
- /**
- * 返回两个日期之间的详细日期数组(包括开始日期和结束日期)。 例如：2007/07/01 到2007/07/03 ,那么返回数组
- * {"2007/07/01","2007/07/02","2007/07/03"}
- *
- * @param startDate
- * 格式"yyyy/MM/dd"
- * @param endDate
- * 格式"yyyy/MM/dd"
- * @return 返回一个字符串数组对象
- */
- public static String[] getArrayDiffDays(String startDate, String endDate) {
- int LEN = 0; // 用来计算两天之间总共有多少天
- // 如果结束日期和开始日期相同
- if (startDate.equals(endDate)) {
- return new String[] { startDate };
- }
- Date sdate = null;
- sdate = getDateObj(startDate, "/"); // 开始日期
- LEN = getDiffDays(startDate, endDate);
- String[] dateResult = new String[LEN + 1];
- dateResult[0] = startDate;
- for (int i = 1; i < LEN + 1; i++) {
- dateResult[i] = getFormatDateTime(getDateAdd(sdate, i), "yyyy/MM/dd");
- }
-
- return dateResult;
- }
-
- public static int getTimeZone() {
-
- TimeZone tz = TimeZone.getDefault();
- String displayName = tz.getDisplayName();
- int dstSavings = tz.getDSTSavings();
- String id = tz.getID();
- String displayName2 = tz.getDisplayName(false, TimeZone.SHORT);
-
- return 1;
- }
-
- /*
- * 当前时间组转换utc时间
- *
- * @param time 当前时间的字符串
- *
- * @param formart 需要转换的格式
- *
- * @return 转换后的字符串
- */
- public static String getUtc(String time, String formart) {
- // 1、获得当前所在的令时偏移量-(zoneOffset + dstOffset)
- String date = null;
- Calendar cal = Calendar.getInstance();
- int zoneOffset = cal.get(Calendar.ZONE_OFFSET);
- int dstOffset = cal.get(Calendar.DST_OFFSET);
- // 2、生成Calendar，并传入对应的时间
- // 使用GMT时区进行时间计算，防止令时切换导致的微调整
- Calendar cal1 = Calendar.getInstance();
- cal1.setTimeZone(TimeZone.getTimeZone("GMT"));
-
- Date stringToDate = stringToDate(time, formart);
- if (stringToDate != null) {
- cal1.setTime(stringToDate);
- cal1.add(Calendar.MILLISECOND, -(zoneOffset + dstOffset));
- // 3、获取对应的UTC时间
-
- date = dateToString(cal1.getTime(), formart);
- }
-
- return date;
-
- }
-
- @SuppressLint("SimpleDateFormat")
- public static Date stringToDate(String str, String formart) {
- DateFormat format = new SimpleDateFormat(formart);
- Date date = null;
- try {
- // Fri Feb 24 00:00:00 CST 2012
- date = format.parse(str);
- } catch (ParseException e) {
- e.printStackTrace();
- }
- // 2012-02-24
- // date = java.sql.Date.valueOf(str);
-
- return date;
- }
-
- @SuppressLint("SimpleDateFormat")
- public static String dateToString(Date date, String type) {
- String str = null;
- SimpleDateFormat format = new SimpleDateFormat(type);
-
- str = format.format(date);
-
- return str;
- }
-
- // utc时间转换当地时间
- public static String utc2Local(String utcTime) {
-
- utcTime = utcTime.substring(0, utcTime.length()-1);
-
- String[] split = utcTime.split("T");
-
- utcTime = split[0]+" "+split[1];
-
- SimpleDateFormat utcFormater = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- utcFormater.setTimeZone(TimeZone.getTimeZone("UTC"));// 时区定义并进行时间获取
- Date gpsUTCDate = null;
- try {
- gpsUTCDate = utcFormater.parse(utcTime);
- } catch (ParseException e) {
- e.printStackTrace();
- }
- SimpleDateFormat localFormater = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- localFormater.setTimeZone(TimeZone.getDefault());
- String localTime = localFormater.format(gpsUTCDate.getTime());
- return localTime;
- }
-
-}
diff --git a/src/main/java/com/gizwits/opensource/appkit/utils/HexStrUtils.java b/src/main/java/com/gizwits/opensource/appkit/utils/HexStrUtils.java
deleted file mode 100644
index 6b53e54..0000000
--- a/src/main/java/com/gizwits/opensource/appkit/utils/HexStrUtils.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.gizwits.opensource.appkit.utils;
-
-import java.util.Locale;
-
-public class HexStrUtils {
-
- public static byte[] hexStringToBytes(String hexString) {
- if (hexString == null || hexString.equals("")) {
- return null;
- }
- hexString = hexString.toUpperCase(Locale.getDefault());
- int length = hexString.length() / 2;
- char[] hexChars = hexString.toCharArray();
- byte[] d = new byte[length];
- for (int i = 0; i < length; i++) {
- int pos = i * 2;
- d[i] = (byte) (charToByte(hexChars[pos]) << 4 | charToByte(hexChars[pos + 1]));
- }
- return d;
- }
-
- private static byte charToByte(char c) {
- return (byte) "0123456789ABCDEF".indexOf(c);
- }
-
- /**
- * 数组转换成十六进制字符串
- *
- * @param byte[]
- * @return HexString
- */
- public static final String bytesToHexString(byte[] bArray) {
- if (bArray == null) {
- return "";
- }
- StringBuffer sb = new StringBuffer(bArray.length);
- String sTemp;
- for (int i = 0; i < bArray.length; i++) {
- sTemp = Integer.toHexString(0xFF & bArray[i]);
- if (sTemp.length() < 2)
- sb.append(0);
- sb.append(sTemp.toUpperCase(Locale.getDefault()));
- }
- return sb.toString();
- }
-
- public static final String splitBytesString(String byteString) {
- StringBuilder sb = new StringBuilder();
- for (int i = 0; i < byteString.length(); i++) {
- sb.append(byteString.charAt(i));
- if (sb.length() % 3 == 0 && sb.charAt(sb.length() - 1) != ' ') {
- sb.insert(sb.length() - 1, ' ');
- }
- }
- return sb.toString();
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/gizwits/opensource/appkit/utils/NetUtils.java b/src/main/java/com/gizwits/opensource/appkit/utils/NetUtils.java
deleted file mode 100644
index e0c6389..0000000
--- a/src/main/java/com/gizwits/opensource/appkit/utils/NetUtils.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/**
- * Project Name:Gokit
- * File Name:NetUtils.java
- * Package Name:com.xpg.gokit.utils
- * Date:2014-11-18 10:06:37
- * Copyright (c) 2014~2015 Xtreme Programming Group, Inc.
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package com.gizwits.opensource.appkit.utils;
-
-import android.app.ActivityManager;
-import android.app.ActivityManager.RunningAppProcessInfo;
-import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.wifi.ScanResult;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.text.TextUtils;
-import android.util.Log;
-
-import java.util.List;
-
-/**
- * 网络工具类.
- *
- * @author Sunny Ding
- *
- * *
- */
-public class NetUtils {
-
- /**
- * 判断当前手机是否连上Wifi.
- *
- * @param context
- * 上下文
- * @return boolean 是否连上网络
- *
- * *
- */
- static public boolean isWifiConnected(Context context) {
- if (context != null) {
- ConnectivityManager mConnectivityManager = (ConnectivityManager) context
- .getSystemService(Context.CONNECTIVITY_SERVICE);
- NetworkInfo mWiFiNetworkInfo = mConnectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
- if (mWiFiNetworkInfo != null) {
- if (mWiFiNetworkInfo.isAvailable()) {
- return mWiFiNetworkInfo.isConnected();
- } else {
- return false;
- }
- }
- }
- return false;
- }
-
- /**
- * 判断当前手机的网络是否可用.
- *
- * @param context
- * 上下文
- * @return boolean 是否连上网络
- *
- * *
- */
- static public boolean isMobileConnected(Context context) {
- if (context != null) {
- ConnectivityManager mConnectivityManager = (ConnectivityManager) context
- .getSystemService(Context.CONNECTIVITY_SERVICE);
- NetworkInfo mMobileNetworkInfo = mConnectivityManager.getNetworkInfo(ConnectivityManager.TYPE_MOBILE);
- if (mMobileNetworkInfo != null) {
- if (mMobileNetworkInfo.isAvailable()) {
- return mMobileNetworkInfo.isConnected();
- } else {
- return false;
- }
- }
- }
- return false;
- }
-
- /**
- * 判断当前网络是手机网络还是WIFI.
- *
- * @param context
- * 上下文
- * @return ConnectedType 数据类型
- *
- * *
- */
- public static int getConnectedType(Context context) {
- if (context != null) {
- ConnectivityManager mConnectivityManager = (ConnectivityManager) context
- .getSystemService(Context.CONNECTIVITY_SERVICE);
- // 获取代表联网状态的NetWorkInfo对象
- NetworkInfo mNetworkInfo = mConnectivityManager.getActiveNetworkInfo();
- // 判断NetWorkInfo对象是否为空；判断当前的网络连接是否可用
- if (mNetworkInfo != null && mNetworkInfo.isAvailable()) {
- return mNetworkInfo.getType();
- }
- }
- return -1;
- }
-
- /**
- * 获取当前WIFI的SSID.
- *
- * @param context
- * 上下文
- * @return ssid
- *
- * *
- */
- public static String getCurentWifiSSID(Context context) {
- String ssid = "";
- if (context != null) {
- WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
- WifiInfo wifiInfo = wifiManager.getConnectionInfo();
-
- if (wifiInfo != null) {
- ssid = wifiInfo.getSSID();
-
- if (!TextUtils.isEmpty(ssid) && ssid.substring(0, 1).equals("\"")
- && ssid.substring(ssid.length() - 1).equals("\"")) {
- ssid = ssid.substring(1, ssid.length() - 1);
- }
- }
-
- }
- return ssid;
- }
-
- /**
- * 用来获得手机扫描到的所有wifi的信息.
- *
- * @param c
- * 上下文
- * @return the current wifi scan result
- */
- public static List getCurrentWifiScanResult(Context c) {
- WifiManager wifiManager = (WifiManager) c.getSystemService(Context.WIFI_SERVICE);
- wifiManager.startScan();
-
- return wifiManager.getScanResults();
-
- }
-
- public interface WifiSsidList {
-
- public void ssidList(List list);
- }
-
- static public String getConnectWifiSsid(Context c) {
- String ssid = "";
- WifiManager wifiManager = (WifiManager) c.getSystemService(Context.WIFI_SERVICE);
- WifiInfo wifiInfo = wifiManager.getConnectionInfo();
- if (wifiInfo != null) {
- ssid = wifiInfo.getSSID();
- }
- return ssid;
- }
-
- // 以下是获得版本信息的工具方法
-
- // 版本名
- public static String getVersionName(Context context) {
- return getPackageInfo(context).versionName;
- }
-
- // 版本号
- public static int getVersionCode(Context context) {
- return getPackageInfo(context).versionCode;
- }
-
- private static PackageInfo getPackageInfo(Context context) {
- PackageInfo pi = null;
-
- try {
- PackageManager pm = context.getPackageManager();
- pi = pm.getPackageInfo(context.getPackageName(), PackageManager.GET_CONFIGURATIONS);
-
- return pi;
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- return pi;
- }
-
- // 检测android 应用在前台还是后台
-
- public static boolean isBackground(Context context) {
- ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
- List appProcesses = activityManager.getRunningAppProcesses();
- for (RunningAppProcessInfo appProcess : appProcesses) {
- if (appProcess.processName.equals(context.getPackageName())) {
- /*
- * BACKGROUND=400 EMPTY=500 FOREGROUND=100 GONE=1000
- * PERCEPTIBLE=130 SERVICE=300 ISIBLE=200
- */
- Log.i(context.getPackageName(), "此appimportace =" + appProcess.importance
- + ",context.getClass().getName()=" + context.getClass().getName());
- if (appProcess.importance != RunningAppProcessInfo.IMPORTANCE_FOREGROUND) {
- Log.i(context.getPackageName(), "处于后台" + appProcess.processName);
- return true;
- } else {
- Log.i(context.getPackageName(), "处于前台" + appProcess.processName);
- return false;
- }
- }
- }
- return false;
- }
-}
diff --git a/src/main/java/com/gizwits/opensource/appkit/utils/ReflectionUtils.java b/src/main/java/com/gizwits/opensource/appkit/utils/ReflectionUtils.java
deleted file mode 100644
index 592b199..0000000
--- a/src/main/java/com/gizwits/opensource/appkit/utils/ReflectionUtils.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package com.gizwits.opensource.appkit.utils;
-
-import android.text.TextUtils;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-/**
- * Created by zhaopan on 2016/11/7.
- * e-mail: kangqiao610@gmail.com
- */
-public class ReflectionUtils {
-
- /**
- * 循环向上转型, 获取对象的 DeclaredMethod
- *
- * @param object : 子类对象
- * @param methodName : 父类中的方法名
- * @param parameterTypes : 父类中的方法参数类型
- * @return 父类中的方法对象
- */
-
- public static Method getDeclaredMethod(Object object, String methodName, Class... parameterTypes) {
- Method method = null;
-
- for (Class clazz = object.getClass(); clazz != Object.class; clazz = clazz.getSuperclass()) {
- try {
- method = clazz.getDeclaredMethod(methodName, parameterTypes);
- return method;
- } catch (Exception e) {
- //这里甚么都不要做！并且这里的异常必须这样写，不能抛出去。
- //如果这里的异常打印或者往外抛，则就不会执行clazz = clazz.getSuperclass(),最后就不会进入到父类中了
-
- }
- }
-
- return null;
- }
-
- /**
- * 直接调用对象方法, 而忽略修饰符(private, protected, default)
- *
- * @param object : 子类对象
- * @param methodName : 父类中的方法名
- * @param parameterTypes : 父类中的方法参数类型
- * @param parameters : 父类中的方法参数
- * @return 父类中方法的执行结果
- */
-
- public static Object invokeMethod(Object object, String methodName, Class[] parameterTypes,
- Object[] parameters) {
- //根据 对象、方法名和对应的方法参数 通过反射 调用上面的方法获取 Method 对象
- Method method = getDeclaredMethod(object, methodName, parameterTypes);
-
- //抑制Java对方法进行检查,主要是针对私有方法而言
- method.setAccessible(true);
-
- try {
- if (null != method) {
-
- //调用object 的 method 所代表的方法，其方法的参数是 parameters
- return method.invoke(object, parameters);
- }
- } catch (IllegalArgumentException e) {
- e.printStackTrace();
- } catch (IllegalAccessException e) {
- e.printStackTrace();
- } catch (InvocationTargetException e) {
- e.printStackTrace();
- }
-
- return null;
- }
-
- /**
- * 循环向上转型, 获取对象的 DeclaredField
- *
- * @param object : 子类对象
- * @param fieldName : 父类中的属性名
- * @return 父类中的属性对象
- */
-
- public static Field getDeclaredField(Object object, String fieldName) {
- Field field = null;
-
- Class clazz = object.getClass();
-
- for (; clazz != Object.class; clazz = clazz.getSuperclass()) {
- try {
- field = clazz.getDeclaredField(fieldName);
- return field;
- } catch (Exception e) {
- //这里甚么都不要做！并且这里的异常必须这样写，不能抛出去。
- //如果这里的异常打印或者往外抛，则就不会执行clazz = clazz.getSuperclass(),最后就不会进入到父类中了
-
- }
- }
-
- return null;
- }
-
- public static Object getFieldValue(Object obj, String fieldName) {
- if (obj == null || TextUtils.isEmpty(fieldName)) {
- return null;
- }
-
- Class clazz = obj.getClass();
- while (clazz != Object.class) {
- try {
- Field field = clazz.getDeclaredField(fieldName);
- field.setAccessible(true);
- return field.get(obj);
- } catch (Exception e) {
- }
- clazz = clazz.getSuperclass();
- }
- return null;
- }
-
- public static void setFieldValue(Object obj, String fieldName, Object value) {
- if (obj == null || TextUtils.isEmpty(fieldName)) {
- return;
- }
- Class clazz = obj.getClass();
- while (clazz != Object.class) {
- try {
- Field field = clazz.getDeclaredField(fieldName);
- field.setAccessible(true);
- field.set(obj, value);
- return;
- } catch (Exception e) {
- }
- clazz = clazz.getSuperclass();
- }
- }
-}
-
diff --git a/src/main/java/com/gizwits/opensource/appkit/utils/SkxDrawableHelper.java b/src/main/java/com/gizwits/opensource/appkit/utils/SkxDrawableHelper.java
deleted file mode 100644
index 8545e03..0000000
--- a/src/main/java/com/gizwits/opensource/appkit/utils/SkxDrawableHelper.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.gizwits.opensource.appkit.utils;
-
-import android.content.res.ColorStateList;
-import android.graphics.drawable.Drawable;
-import android.support.v4.graphics.drawable.DrawableCompat;
-
-public class SkxDrawableHelper {
-
- /**
- * 对目标Drawable 进行着色
- *
- * @param drawable 目标Drawable
- * @param color 着色的颜色值
- * @return 着色处理后的Drawable
- */
- public static Drawable tintDrawable(Drawable drawable, int color) {
- // 获取此drawable的共享状态实例
- Drawable wrappedDrawable = getCanTintDrawable(drawable);
- // 进行着色
- DrawableCompat.setTint(wrappedDrawable, color);
- return wrappedDrawable;
- }
-
- /**
- * 对目标Drawable 进行着色。
- * 通过ColorStateList 指定单一颜色
- *
- * @param drawable 目标Drawable
- * @param color 着色值
- * @return 着色处理后的Drawable
- */
- public static Drawable tintListDrawable(Drawable drawable, int color) {
- return tintListDrawable(drawable, ColorStateList.valueOf(color));
- }
-
- /**
- * 对目标Drawable 进行着色
- *
- * @param drawable 目标Drawable
- * @param colors 着色值
- * @return 着色处理后的Drawable
- */
- public static Drawable tintListDrawable( Drawable drawable, ColorStateList colors) {
- Drawable wrappedDrawable = getCanTintDrawable(drawable);
- // 进行着色
- DrawableCompat.setTintList(wrappedDrawable, colors);
- return wrappedDrawable;
- }
-
- /**
- * 获取可以进行tint 的Drawable
- *
- * 对原drawable进行重新实例化 newDrawable()
- * 包装 warp()
- * 可变操作 mutate()
- *
- * @param drawable 原始drawable
- * @return 可着色的drawable
- */
- private static Drawable getCanTintDrawable(Drawable drawable) {
- // 获取此drawable的共享状态实例
- Drawable.ConstantState state = drawable.getConstantState();
- // 对drawable 进行重新实例化、包装、可变操作
- return DrawableCompat.wrap(state == null ? drawable : state.newDrawable()).mutate();
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/gizwits/opensource/appkit/utils/ToolUtils.java b/src/main/java/com/gizwits/opensource/appkit/utils/ToolUtils.java
deleted file mode 100644
index 577e18a..0000000
--- a/src/main/java/com/gizwits/opensource/appkit/utils/ToolUtils.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.gizwits.opensource.appkit.utils;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Color;
-import android.graphics.drawable.Drawable;
-import android.widget.Toast;
-
-import com.gizwits.opensource.appkit.CommonModule.GosDeploy;
-import com.gizwits.opensource.appkit.R;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by admin on 2017/7/25.
- */
-
-public class ToolUtils {
- public static float getHue(int color) {
- float[] HSV = new float[3];
- Color.colorToHSV(color, HSV);
- return (HSV[0] * 255 / 360);
- }
-
- public static int getInnerColor(float hue) {
- float[] HSV = new float[3];
- HSV[0] = hue * 360 / 255;
- HSV[1] = 255;
- HSV[2] = 255;
- return Color.HSVToColor(HSV);
- }
-
- private static long lastClickTime = 0;
- public static final int MIN_CLICK_DELAY_TIME = 800;
-
- public static boolean noDoubleClick() {
- long currentTime = Calendar.getInstance().getTimeInMillis();
- if (currentTime - lastClickTime > MIN_CLICK_DELAY_TIME) {
- lastClickTime = currentTime;
- return true;
- } else {
- return false;
- }
- }
-
- public static List> parseJson(Context context, String str) throws JSONException {
- if (str == null || str.equals("")) {
- Toast.makeText(context, context.getString(R.string.download_fail), Toast.LENGTH_SHORT).show();
- }
- JSONObject uiJsonObject = new JSONObject(str);
- JSONObject jsonObject = uiJsonObject.has("object") ? uiJsonObject.getJSONObject("object") : null;
- List> list = new ArrayList>();
- if (uiJsonObject != null) {
- JSONArray sessionJsonArrays = uiJsonObject.getJSONArray("sections");
- if (sessionJsonArrays != null) {
- for (int i = 0; i < sessionJsonArrays.length(); i++) {
- JSONObject session = sessionJsonArrays.getJSONObject(i);
- JSONArray elementjJsonArray = session.getJSONArray("elements");
- if (elementjJsonArray != null) {
- for (int j = 0; j < elementjJsonArray.length(); j++) {
- Map map = new HashMap();
- JSONObject elementObject = elementjJsonArray.getJSONObject(j);
- String type = elementObject.getString("type");
- String title = elementObject.has("title") ? elementObject.getString("title") : "";
- map.put("title", title);
- map.put("type", type);
- String value = null;
- if (type.equals("QBooleanElement")) {
- value = elementObject.has("boolValue") ? elementObject.getString("boolValue") : "";
- } else if (type.equals("QFloatElement")) {
- value = elementObject.has("value") ? elementObject.getString("value") : "";
- }
- map.put("value", value);
- list.add(map);
- }
- }
- }
-
- }
- }
-
- return list;
- }
-
-
- public static Drawable editIconAlpha(Resources res, int id) {
- int color = GosDeploy.appConfig_Contrast();
- Drawable drawable = SkxDrawableHelper.tintDrawable(res.getDrawable(id), color);
- drawable.setAlpha(60);
- return drawable;
- }
-
- public static Drawable editIcon(Resources res, int id) {
- int color = GosDeploy.appConfig_Contrast();
- return SkxDrawableHelper.tintDrawable(res.getDrawable(id), color);
- }
-
- public static int editTextAlpha() {
- int color = GosDeploy.appConfig_Contrast();
- int red = Color.red(color);
- int green = Color.green(color);
- int blue = Color.blue(color);
- int color1 = Color.argb(160, red, green, blue);
- return color1;
- }
-
- public static int editStatusBarColor(int color) {
- int red = Color.red(color);
- int green = Color.green(color);
- int blue = Color.blue(color);
- int color1 = Color.argb(255, red, green, blue);
- return color1;
- }
-// // 需要点击几次 就设置几
-// static long[] mHits = null;
-// //public static boolean mShow = false;
-//
-// public static void onDisplaySettingButton() {
-// if (mHits == null) {
-// mHits = new long[5];
-// }
-// System.arraycopy(mHits, 1, mHits, 0, mHits.length - 1);//把从第二位至最后一位之间的数字复制到第一位至倒数第一位
-// mHits[mHits.length - 1] = SystemClock.uptimeMillis();//记录一个时间
-// if (SystemClock.uptimeMillis() - mHits[0] <= 1000) {//一秒内连续点击。
-// mHits = null; //这里说明一下，我们在进来以后需要还原状态，否则如果点击过快，第六次，第七次 都会不断进来触发该效果。重新开始计数即可
-//// if (mShow) {
-//// mShow = false;
-//// } else {
-//// mShow = true;
-//// }
-// mShow = true;
-// Log.e("Tool", "onDisplaySettingButton: 连点五次进入deploy模式");
-// //这里一般会把mShow存储到sp中。
-// }
-// }
-
-
-}
diff --git a/src/main/java/com/gizwits/opensource/appkit/view/.DS_Store b/src/main/java/com/gizwits/opensource/appkit/view/.DS_Store
deleted file mode 100644
index d3aa66b..0000000
Binary files a/src/main/java/com/gizwits/opensource/appkit/view/.DS_Store and /dev/null differ
diff --git a/src/main/java/com/gizwits/opensource/appkit/view/BaseKeyboard.java b/src/main/java/com/gizwits/opensource/appkit/view/BaseKeyboard.java
deleted file mode 100644
index 01a60c7..0000000
--- a/src/main/java/com/gizwits/opensource/appkit/view/BaseKeyboard.java
+++ /dev/null
@@ -1,210 +0,0 @@
-package com.gizwits.opensource.appkit.view;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.inputmethodservice.Keyboard;
-import android.inputmethodservice.KeyboardView;
-import android.text.Editable;
-import android.text.TextUtils;
-import android.util.TypedValue;
-import android.view.View;
-import android.widget.EditText;
-
-/**
- * Created by xud on 2017/3/2.
- */
-
-public abstract class BaseKeyboard extends Keyboard implements KeyboardView.OnKeyboardActionListener {
-
- private EditText mEditText;
-
- private View mNextFocusView;
-
- private KeyStyle mKeyStyle;
-
- protected Context mContext;
-
- public BaseKeyboard(Context context, int xmlLayoutResId) {
- super(context, xmlLayoutResId);
- mContext = context;
- }
-
- public BaseKeyboard(Context context, int xmlLayoutResId, int modeId, int width, int height) {
- super(context, xmlLayoutResId, modeId, width, height);
- mContext = context;
- }
-
- public BaseKeyboard(Context context, int xmlLayoutResId, int modeId) {
- super(context, xmlLayoutResId, modeId);
- mContext = context;
- }
-
- public BaseKeyboard(Context context, int layoutTemplateResId, CharSequence characters, int columns, int horizontalPadding) {
- super(context, layoutTemplateResId, characters, columns, horizontalPadding);
- mContext = context;
- }
-
- public void setEditText(EditText editText) {
- mEditText = editText;
- }
-
- public void setNextFocusView(View nextFocusView) {
- mNextFocusView = nextFocusView;
- }
-
- public void setKeyStyle(KeyStyle keyStyle) {
- mKeyStyle = keyStyle;
- }
-
- public EditText getEditText() {
- return mEditText;
- }
-
- public View getNextFocusView() {
- return mNextFocusView;
- }
-
- public KeyStyle getKeyStyle() {
- return mKeyStyle;
- }
-
- public int getKeyCode( int redId) {
- return mContext.getResources().getInteger(redId);
- }
-
- @Override
- public void onPress(int primaryCode) {
-
- }
-
- @Override
- public void onRelease(int primaryCode) {
-
- }
-
- @Override
- public void onKey(int primaryCode, int[] keyCodes) {
- if (null != mEditText && mEditText.hasFocus() && !handleSpecialKey(primaryCode)) {
- Editable editable = mEditText.getText();
- int start = mEditText.getSelectionStart();
- int end = mEditText.getSelectionEnd();
- if (end > start) {
- editable.delete(start, end);
- }
- if (primaryCode == KEYCODE_DELETE) {
- if (!TextUtils.isEmpty(editable)) {
- if (start > 0) {
- editable.delete(start - 1, start);
- }
- }
- } else if (primaryCode == KEYCODE_CANCEL) {
- hideKeyboard();
- } else {
- editable.insert(start, Character.toString((char) primaryCode));
- }
- }
- }
-
- @Override
- public void onText(CharSequence text) {
-
- }
-
- @Override
- public void swipeLeft() {
-
- }
-
- @Override
- public void swipeRight() {
-
- }
-
- @Override
- public void swipeDown() {
-
- }
-
- @Override
- public void swipeUp() {
-
- }
-
- public void hideKeyboard() {
- if (mNextFocusView != null) {
- mNextFocusView.requestFocus();
- }
- }
-
- /**
- * @param primaryCode
- * @return true if handle the key
- * false no handle and dispatch
- */
- public abstract boolean handleSpecialKey(int primaryCode);
-
- public interface KeyStyle {
-
- public Drawable getKeyBackound(Key key);
-
- public Float getKeyTextSize(Key key);
-
- public Integer getKeyTextColor(Key key);
-
- public CharSequence getKeyLabel(Key key);
- }
-
- public Padding getPadding() {
- return new Padding(0, 0, 0, 0);
- }
-
- public static class DefaultKeyStyle implements KeyStyle {
-
- @Override
- public Drawable getKeyBackound(Key key) {
- return key.iconPreview;
- }
-
- @Override
- public Float getKeyTextSize(Key key) {
- return null;
- }
-
- @Override
- public Integer getKeyTextColor(Key key) {
- return null;
- }
-
- @Override
- public CharSequence getKeyLabel(Key key) {
- return key.label;
- }
- }
-
- public static class Padding {
- public int top;
- public int left;
- public int bottom;
- public int right;
-
- /**
- * px
- *
- * @param top
- * @param left
- * @param bottom
- * @param right
- */
- public Padding(int top, int left, int bottom, int right) {
- this.top = top;
- this.left = left;
- this.bottom = bottom;
- this.right = right;
- }
- }
-
- public float convertSpToPixels(Context context, float sp) {
- float px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, sp, context.getResources().getDisplayMetrics());
- return px;
- }
-}
diff --git a/src/main/java/com/gizwits/opensource/appkit/view/BaseKeyboardView.java b/src/main/java/com/gizwits/opensource/appkit/view/BaseKeyboardView.java
deleted file mode 100644
index c8fc434..0000000
--- a/src/main/java/com/gizwits/opensource/appkit/view/BaseKeyboardView.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package com.gizwits.opensource.appkit.view;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
-import android.inputmethodservice.Keyboard;
-import android.inputmethodservice.KeyboardView;
-import android.os.Build;
-import android.util.AttributeSet;
-import android.widget.EditText;
-
-import com.gizwits.opensource.appkit.utils.ReflectionUtils;
-
-import java.util.List;
-
-/**
- * Created by xud on 2017/3/2.
- */
-
-public class BaseKeyboardView extends KeyboardView {
-
- private static final String TAG = "BaseKeyboardView";
- private Drawable rKeyBackground;
- private int rLabelTextSize;
- private int rKeyTextSize;
- private int rKeyTextColor;
- private float rShadowRadius;
- private int rShadowColor;
-
- private Rect rClipRegion;
- private Keyboard.Key rInvalidatedKey;
-
- public BaseKeyboardView(Context context, AttributeSet attrs) {
- super(context, attrs);
- init(context, attrs, 0, 0);
- }
-
- public BaseKeyboardView(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- init(context, attrs, defStyleAttr, 0);
- }
-
- @TargetApi(Build.VERSION_CODES.LOLLIPOP)
- public BaseKeyboardView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
- super(context, attrs, defStyleAttr, defStyleRes);
- init(context, attrs, defStyleAttr, defStyleRes);
- }
-
- private void init(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
- rKeyBackground = (Drawable) ReflectionUtils.getFieldValue(this, "mKeyBackground");
- rLabelTextSize = (Integer) ReflectionUtils.getFieldValue(this, "mLabelTextSize");
- rKeyTextSize = (Integer) ReflectionUtils.getFieldValue(this, "mKeyTextSize");
- rKeyTextColor = (Integer) ReflectionUtils.getFieldValue(this, "mKeyTextColor");
- rShadowColor = (Integer) ReflectionUtils.getFieldValue(this, "mShadowColor");
- rShadowRadius = (Float) ReflectionUtils.getFieldValue(this, "mShadowRadius");
- }
-
- @Override
- public void onDraw(Canvas canvas) {
- //说明CustomKeyboardView只针对CustomBaseKeyboard键盘进行重绘,
- // 且CustomBaseKeyboard必需有设置CustomKeyStyle的回调接口实现, 才进行重绘, 这才有意义
- if (null == getKeyboard() || !(getKeyboard() instanceof BaseKeyboard) || null == ((BaseKeyboard) getKeyboard()).getKeyStyle()) {
- super.onDraw(canvas);
- return;
- }
- rClipRegion = (Rect) ReflectionUtils.getFieldValue(this, "mClipRegion");
- rInvalidatedKey = (Keyboard.Key) ReflectionUtils.getFieldValue(this, "mInvalidatedKey");
- super.onDraw(canvas);
- onRefreshKey(canvas);
- }
-
- /**
- * onRefreshKey是对父类的private void onBufferDraw()进行的重写. 只是在对key的绘制过程中进行了重新设置.
- *
- * @param canvas
- */
- private void onRefreshKey(Canvas canvas) {
- final Paint paint = (Paint) ReflectionUtils.getFieldValue(this, "mPaint");
- final Rect padding = (Rect) ReflectionUtils.getFieldValue(this, "mPadding");
-
- paint.setColor(rKeyTextColor);
- final int kbdPaddingLeft = getPaddingLeft();
- final int kbdPaddingTop = getPaddingTop();
- Drawable keyBackground = null;
-
- final Rect clipRegion = rClipRegion;
- final Keyboard.Key invalidKey = rInvalidatedKey;
- boolean drawSingleKey = false;
- if (invalidKey != null && canvas.getClipBounds(clipRegion)) {
- // Is clipRegion completely contained within the invalidated key?
- if (invalidKey.x + kbdPaddingLeft - 1 <= clipRegion.left &&
- invalidKey.y + kbdPaddingTop - 1 <= clipRegion.top &&
- invalidKey.x + invalidKey.width + kbdPaddingLeft + 1 >= clipRegion.right &&
- invalidKey.y + invalidKey.height + kbdPaddingTop + 1 >= clipRegion.bottom) {
- drawSingleKey = true;
- }
- }
-
- //拿到当前键盘被弹起的输入源 和 键盘为每个key的定制实现customKeyStyle
- EditText etCur = ((BaseKeyboard) getKeyboard()).getEditText();
- BaseKeyboard.KeyStyle customKeyStyle = ((BaseKeyboard) getKeyboard()).getKeyStyle();
-
- List keys = getKeyboard().getKeys();
- final int keyCount = keys.size();
- //canvas.drawColor(0x00000000, PorterDuff.Mode.CLEAR);
- for (int i = 0; i < keyCount; i++) {
- final Keyboard.Key key = keys.get(i);
- if (drawSingleKey && invalidKey != key) {
- continue;
- }
-
- //获取为Key自定义的背景, 若没有定制, 使用KeyboardView的默认属性keyBackground设置
- keyBackground = customKeyStyle.getKeyBackound(key);
- if (null == keyBackground) {
- keyBackground = rKeyBackground;
- }
-
- int[] drawableState = key.getCurrentDrawableState();
- keyBackground.setState(drawableState);
-
- //获取为Key自定义的Label, 若没有定制, 使用xml布局中指定的
- CharSequence keyLabel = customKeyStyle.getKeyLabel(key);
- if (null == keyLabel) {
- keyLabel = key.label;
- }
- // Switch the character to uppercase if shift is pressed
- String label = keyLabel == null ? null : adjustCase(keyLabel).toString();
-
- final Rect bounds = keyBackground.getBounds();
- if (key.width != bounds.right ||
- key.height != bounds.bottom) {
- keyBackground.setBounds(0, 0, key.width, key.height);
- }
- canvas.translate(key.x + kbdPaddingLeft, key.y + kbdPaddingTop);
- keyBackground.draw(canvas);
-
- if (label != null) {
- //获取为Key的Label的字体大小, 若没有定制, 使用KeyboardView的默认属性keyTextSize设置
- Float customKeyTextSize = customKeyStyle.getKeyTextSize(key);
- // For characters, use large font. For labels like "Done", use small font.
- if (null != customKeyTextSize) {
- paint.setTextSize(customKeyTextSize);
- paint.setTypeface(Typeface.DEFAULT);
- //paint.setTypeface(Typeface.DEFAULT_BOLD);
- } else {
- if (label.length() > 1 && key.codes.length < 2) {
- paint.setTextSize(rLabelTextSize);
- paint.setTypeface(Typeface.DEFAULT);
- //paint.setTypeface(Typeface.DEFAULT_BOLD);
- } else {
- paint.setTextSize(rKeyTextSize);
- paint.setTypeface(Typeface.DEFAULT);
- //paint.setTypeface(Typeface.DEFAULT);
- }
- }
-
- //获取为Key的Label的字体颜色, 若没有定制, 使用KeyboardView的默认属性keyTextColor设置
- Integer customKeyTextColor = customKeyStyle.getKeyTextColor(key);
- if (null != customKeyTextColor) {
- paint.setColor(customKeyTextColor);
- } else {
- paint.setColor(rKeyTextColor);
- }
- // Draw a drop shadow for the text
- paint.setShadowLayer(rShadowRadius, 0, 0, rShadowColor);
- // Draw the text
- canvas.drawText(label,
- (key.width - padding.left - padding.right) / 2
- + padding.left,
- (key.height - padding.top - padding.bottom) / 2
- + (paint.getTextSize() - paint.descent()) / 2 + padding.top,
- paint);
- // Turn off drop shadow
- paint.setShadowLayer(0, 0, 0, 0);
- } else if (key.icon != null) {
- final int drawableX = (key.width - padding.left - padding.right
- - key.icon.getIntrinsicWidth()) / 2 + padding.left;
- final int drawableY = (key.height - padding.top - padding.bottom
- - key.icon.getIntrinsicHeight()) / 2 + padding.top;
- canvas.translate(drawableX, drawableY);
- key.icon.setBounds(0, 0,
- key.icon.getIntrinsicWidth(), key.icon.getIntrinsicHeight());
- key.icon.draw(canvas);
- canvas.translate(-drawableX, -drawableY);
- }
- canvas.translate(-key.x - kbdPaddingLeft, -key.y - kbdPaddingTop);
- }
- rInvalidatedKey = null;
- }
-
- private CharSequence adjustCase(CharSequence label) {
- if (getKeyboard().isShifted() && label != null && label.length() < 3
- && Character.isLowerCase(label.charAt(0))) {
- label = label.toString().toUpperCase();
- }
- return label;
- }
-}
diff --git a/src/main/java/com/gizwits/opensource/appkit/view/CircleProgress.java b/src/main/java/com/gizwits/opensource/appkit/view/CircleProgress.java
deleted file mode 100644
index f793c4e..0000000
--- a/src/main/java/com/gizwits/opensource/appkit/view/CircleProgress.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.gizwits.opensource.appkit.view;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.util.AttributeSet;
-import android.util.TypedValue;
-import android.view.View;
-import com.gizwits.opensource.appkit.R;
-
-
-
-/**
- * Created by qiaoning on 2017/8/9.
- */
-
-public class CircleProgress extends View {
-
- //小圆的个数
- private int numOfCircles;
- //最大圆半径
- private int maxRadius;
- //最小圆半径
- private int minRadius;
- //旋转速度
- private int rotateSpeedInMillis;
- //是否顺时针旋转
- private boolean isClockwise;
- //小圆的颜色
- private int circleColor;
-
- private Paint paint;
-
- private float rotateDegrees;
- private int numOfRotate;
-
- public CircleProgress(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- // TODO Auto-generated constructor stub
- TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.CircleProgress);
-
- numOfCircles = array.getInt(R.styleable.CircleProgress_numOfCircles, 10);
- maxRadius = array.getDimensionPixelSize(R.styleable.CircleProgress_maxRadius, dp2px(10));
- minRadius = array.getDimensionPixelSize(R.styleable.CircleProgress_minRadius, dp2px(2));
- rotateSpeedInMillis = array.getInt(R.styleable.CircleProgress_rotateSpeedInMillis, 200);
- isClockwise = array.getBoolean(R.styleable.CircleProgress_isClockwise, true);
- circleColor = array.getColor(R.styleable.CircleProgress_circleColor, Color.BLACK);
-
- array.recycle();
-
- paint = new Paint();
- paint.setStyle(Paint.Style.FILL);
- paint.setAntiAlias(true);
- paint.setColor(circleColor);
-
- //view每次旋转的角度
- rotateDegrees = 360 / numOfCircles;
- //旋转的周期为小圆的个数
- numOfRotate = 0;
-
- }
-
- public CircleProgress(Context context, AttributeSet attrs) {
- this(context, attrs, 0);
- }
-
- public CircleProgress(Context context) {
- this(context, null);
- }
-
- @Override
- protected void onDraw(Canvas canvas) {
-
- //按一定角度旋转画布canvas，当旋转周期==小圆个数时重置
- if (numOfRotate == numOfCircles) {
- numOfRotate = 0;
- }
-
- //根据旋转的方向旋转画布canvas，然后再画小圆
- if (isClockwise) {
- canvas.rotate(rotateDegrees * numOfRotate, getWidth() / 2, getHeight() / 2);
- } else {
- canvas.rotate(-rotateDegrees * numOfRotate, getWidth() / 2, getHeight() / 2);
- }
-
- //记录旋转的次数，下次invalidat()重绘时就可以使用新的角度旋转canvas，使小圆产生旋转的感觉
- numOfRotate++;
-
- //取View最短边，并减去最大圆的半径，得到所有圆所在的圆路径的半径
- int radius = (getWidth() > getHeight() ? getHeight() : getWidth()) / 2 - maxRadius;
- //每个小圆的半径增量
- float radiusIncrement = (float) (maxRadius - minRadius) / numOfCircles;
- //每隔多少度绘制一个小圆,弧度制
- double angle = 2 * Math.PI / numOfCircles;
-
- //按位置画小圆
- //每个小圆的位置可以由正弦余弦函数求出，并且每个小圆半径依次递增，若反方向则依次递减
- if (isClockwise) {
- for (int i = 0; i < numOfCircles; i++) {
- float x = (float) (getWidth() / 2 + Math.cos(i * angle) * radius);
- float y = (float) (getHeight() / 2 - Math.sin(i * angle) * radius);
- canvas.drawCircle(x, y, maxRadius - radiusIncrement * i, paint);
- }
- } else {
- for (int i = 0; i < numOfCircles; i++) {
- float x = (float) (getWidth() / 2 + Math.cos(i * angle) * radius);
- float y = (float) (getHeight() / 2 - Math.sin(i * angle) * radius);
- canvas.drawCircle(x, y, minRadius + radiusIncrement * i, paint);
- }
- }
-
-
- //旋转间隔，即progressBar的旋转速度
- postDelayed(new Runnable() {
-
- @Override
- public void run() {
- // TODO Auto-generated method stub
- invalidate();
- }
- }, rotateSpeedInMillis);
- }
-
- //dp转px函数
- private int dp2px(int dp) {
- return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, getResources().getDisplayMetrics());
- }
-}
diff --git a/src/main/java/com/gizwits/opensource/appkit/view/DotView.java b/src/main/java/com/gizwits/opensource/appkit/view/DotView.java
deleted file mode 100644
index d83123a..0000000
--- a/src/main/java/com/gizwits/opensource/appkit/view/DotView.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.gizwits.opensource.appkit.view;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Paint.Style;
-import android.util.AttributeSet;
-import android.view.View;
-
-import com.gizwits.opensource.appkit.R;
-
-
-public class DotView extends View {
- private Paint p;
- private int width;
- private int height;
- private int dash;
-
- public DotView(Context context, AttributeSet attrs) {
- super(context, attrs);
- init(context);
- }
-
- public DotView(Context context) {
- super(context);
- init(context);
- }
- private void init(Context context){
- p = new Paint(Paint.ANTI_ALIAS_FLAG);
- p.setStyle(Style.FILL);
- p.setColor(context.getResources().getColor(R.color.line_gray));
-
- final float scale = context.getResources().getDisplayMetrics().density;
- dash=(int) (3 * scale + 0.5f);
- }
- @Override
- protected void onDraw(Canvas canvas) {
-
- if(width>10){
- for(int i=0;i= Build.VERSION_CODES.HONEYCOMB) {
- setLayerType(View.LAYER_TYPE_SOFTWARE, null);
- }
- // 从描述文件中读出gif的值，创建出Movie实例
- final TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.GifView, defStyle,
- R.style.Widget_GifView);
- mMovieResourceId = array.getResourceId(R.styleable.GifView_gif, -1);
- mPaused = array.getBoolean(R.styleable.GifView_paused, false);
- array.recycle();
- if (mMovieResourceId != -1) {
- mMovie = Movie.decodeStream(getResources().openRawResource(mMovieResourceId));
- }
- }
-
- /**
- * 设置gif图资源
- *
- * @param movieResId
- */
- public void setMovieResource(int movieResId) {
- this.mMovieResourceId = movieResId;
- mMovie = Movie.decodeStream(getResources().openRawResource(mMovieResourceId));
- requestLayout();
- }
-
- public void setMovie(Movie movie) {
- this.mMovie = movie;
- requestLayout();
- }
-
- public Movie getMovie() {
- return mMovie;
- }
-
- public void setMovieTime(int time) {
- mCurrentAnimationTime = time;
- invalidate();
- }
-
- /**
- * 设置暂停
- *
- * @param paused
- */
- public void setPaused(boolean paused) {
- this.mPaused = paused;
- if (!paused) {
- mMovieStart = android.os.SystemClock.uptimeMillis() - mCurrentAnimationTime;
- }
- invalidate();
- }
-
- /**
- * 判断gif图是否停止了
- *
- * @return
- */
- public boolean isPaused() {
- return this.mPaused;
- }
-
- @Override
- protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- if (mMovie != null) {
- int movieWidth = mMovie.width();
- int movieHeight = mMovie.height();
- int maximumWidth = MeasureSpec.getSize(widthMeasureSpec);
- float scaleW = (float) movieWidth / (float) maximumWidth;
- mScale = 1f / scaleW;
- mMeasuredMovieWidth = maximumWidth;
- mMeasuredMovieHeight = (int) (movieHeight * mScale);
- setMeasuredDimension(mMeasuredMovieWidth, mMeasuredMovieHeight);
- } else {
- setMeasuredDimension(getSuggestedMinimumWidth(), getSuggestedMinimumHeight());
- }
- }
-
- @Override
- protected void onLayout(boolean changed, int l, int t, int r, int b) {
- super.onLayout(changed, l, t, r, b);
- mLeft = (getWidth() - mMeasuredMovieWidth) / 2f;
- mTop = (getHeight() - mMeasuredMovieHeight) / 2f;
- mVisible = getVisibility() == View.VISIBLE;
- }
-
- @Override
- protected void onDraw(Canvas canvas) {
- if (mMovie != null) {
- if (!mPaused) {
- updateAnimationTime();
- drawMovieFrame(canvas);
- invalidateView();
- } else {
- drawMovieFrame(canvas);
- }
- }
- }
-
- private void invalidateView() {
- if (mVisible) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.BASE) {
- postInvalidate();
- } else {
- invalidate();
- }
- }
- }
-
- private void updateAnimationTime() {
- long now = android.os.SystemClock.uptimeMillis();
- // 如果第一帧，记录起始时间
- if (mMovieStart == 0) {
- mMovieStart = now;
- }
- // 取出动画的时长
- int dur = mMovie.duration();
- if (dur == 0) {
- dur = DEFAULT_MOVIE_DURATION;
- }
- // 算出需要显示第几帧
- mCurrentAnimationTime = (int) ((now - mMovieStart) % dur);
- }
-
- private void drawMovieFrame(Canvas canvas) {
- // 设置要显示的帧，绘制即可
- mMovie.setTime(mCurrentAnimationTime);
- canvas.saveLayer(0, 0, getWidth(), getHeight(), null);
- canvas.scale(mScale, mScale);
- mMovie.draw(canvas, mLeft / mScale, mTop / mScale);
- canvas.restore();
- }
-
- public void onScreenStateChanged(int screenState) {
- mVisible = screenState == DEFAULT_MOVIE_DURATION;
- invalidateView();
- }
-
- @Override
- protected void onVisibilityChanged(View changedView, int visibility) {
- super.onVisibilityChanged(changedView, visibility);
- mVisible = visibility == View.VISIBLE;
- invalidateView();
- }
-
- @Override
- protected void onWindowVisibilityChanged(int visibility) {
- super.onWindowVisibilityChanged(visibility);
- mVisible = visibility == View.VISIBLE;
- invalidateView();
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/gizwits/opensource/appkit/view/HexWatcher.java b/src/main/java/com/gizwits/opensource/appkit/view/HexWatcher.java
deleted file mode 100644
index d911693..0000000
--- a/src/main/java/com/gizwits/opensource/appkit/view/HexWatcher.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.gizwits.opensource.appkit.view;
-
-import java.util.Locale;
-
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.widget.EditText;
-
-public class HexWatcher implements TextWatcher {
- private EditText _text;
-
- public HexWatcher(EditText _text) {
- this._text = _text;
- }
-
- @Override
- public void beforeTextChanged(CharSequence s, int start, int count, int after) {
- }
-
- @Override
- public void onTextChanged(CharSequence s, int start, int before, int count) {
- if (s == null || s.length() == 0)
- return;
- StringBuilder sb = new StringBuilder();
- for (int i = 0; i < s.length(); i++) {
- if (s.charAt(i) == ' ' && i < s.length() - 1) {
- continue;
- } else {
- sb.append(s.charAt(i));
- if (sb.length() % 3 == 0 && sb.charAt(sb.length() - 1) != ' ') {
- sb.insert(sb.length() - 1, ' ');
- }
- }
- }
-
- if (!sb.toString().equals(s.toString())) {
- int index = start + 1;
- if (sb.charAt(start) == ' ') {
- if (before == 0) {
- index++;
- } else {
- index--;
- }
- } else {
- if (before == 1) {
- index--;
- }
- }
- _text.setText(sb.toString().toUpperCase(Locale.getDefault()));
- _text.setSelection(index);
- }
-
- // _text.removeTextChangedListener(this);
- // _text.setText(s.toString().toUpperCase(Locale.getDefault()));
- // _text.addTextChangedListener(this);
-
- }
-
- @Override
- public void afterTextChanged(Editable s) {
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/gizwits/opensource/appkit/view/KeyboardWithSearchView.java b/src/main/java/com/gizwits/opensource/appkit/view/KeyboardWithSearchView.java
deleted file mode 100644
index a004cd7..0000000
--- a/src/main/java/com/gizwits/opensource/appkit/view/KeyboardWithSearchView.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.gizwits.opensource.appkit.view;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.os.Build;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.LinearLayout;
-
-import com.gizwits.opensource.appkit.R;
-
-
-/**
- * Created by xud on 2017/3/9.
- */
-
-public class KeyboardWithSearchView extends LinearLayout {
-
-
- private Context mContext;
-
-
- private BaseKeyboardView mBaseKeyboardView;
-
- private LinearLayout mKeyboadViewContainer;
-
- //private OnSizeChangedListener mOnSizeChangedListener;
-
-
- public KeyboardWithSearchView(Context context) {
- super(context);
- init(context);
- }
-
- public KeyboardWithSearchView(Context context, AttributeSet attrs) {
- super(context, attrs);
- init(context);
- }
-
- public KeyboardWithSearchView(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- init(context);
- }
-
- @TargetApi(Build.VERSION_CODES.LOLLIPOP)
- public KeyboardWithSearchView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
- super(context, attrs, defStyleAttr, defStyleRes);
- init(context);
- }
-
-// protected RecyclerView getRecyclerView() {
-// return mRecyclerView;
-// }
-
- public BaseKeyboardView getBaseKeyboardView() {
- return mBaseKeyboardView;
- }
-
-
-// public void setOnSizeChangedListener(OnSizeChangedListener onSizeChangedListener) {
-// mOnSizeChangedListener = onSizeChangedListener;
-// }
-
- public LinearLayout getKeyboadViewContainer() {
- return mKeyboadViewContainer;
- }
-
-
- private void init(Context context) {
- mContext = context;
- View view = LayoutInflater.from(context).inflate(R.layout.layout_recycler_keyboard_view, this, true);
-// mRecyclerView = (RecyclerView) view.findViewById(R.id.search_recycler_view);
- mBaseKeyboardView = (BaseKeyboardView) view.findViewById(R.id.keyboard_view);
- mKeyboadViewContainer = (LinearLayout) view.findViewById(R.id.keyboard_container);
- }
-
-// public void initRecyclerView(KeyboardSearchBaseAdapter adapter, RecyclerView.LayoutManager manager, RecyclerView.ItemDecoration itemDecoration) {
-// mRecyclerView.setAdapter(adapter);
-// mRecyclerView.setLayoutManager(manager);
-// mRecyclerView.addItemDecoration(itemDecoration);
-// }
-//
-// public void setSearchResult(List list, boolean hasFixedSize) {
-// if(mRecyclerView.getAdapter() == null) {
-// throw new RuntimeException("this view has not invoked init method");
-// }
-// mRecyclerView.getLayoutManager().scrollToPosition(0);
-// if(list == null || list.size() ==0) {
-// mRecyclerView.setVisibility(GONE);
-// } else {
-// int height = AssetsUtils.diptopx(mContext, Math.min(3,list.size()) * 49) +
-// Math.min(3,list.size());
-// ViewGroup.LayoutParams params = mRecyclerView.getLayoutParams();
-// if(params != null) {
-// params.height = height;
-// }else {
-// LinearLayout.LayoutParams newParams =
-// new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-// height);
-// mRecyclerView.setLayoutParams(newParams);
-// }
-// mRecyclerView.setVisibility(VISIBLE);
-// }
-// mRecyclerView.setHasFixedSize(hasFixedSize);
-//
-// KeyboardSearchBaseAdapter adapter = (KeyboardSearchBaseAdapter) mRecyclerView.getAdapter();
-// adapter.setAdapterData(list);
-// adapter.notifyDataSetChanged();
-// }
-
-// @Override
-// protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-// super.onSizeChanged(w, h, oldw, oldh);
-// if(mOnSizeChangedListener != null) {
-// mOnSizeChangedListener.sizeChanged(w,h,oldw,oldh);
-// }
-// }
-//
-// protected interface OnSizeChangedListener {
-// void sizeChanged(int w, int h, int oldw, int oldh);
-// }
-}
diff --git a/src/main/java/com/gizwits/opensource/appkit/view/RoundProgressBar.java b/src/main/java/com/gizwits/opensource/appkit/view/RoundProgressBar.java
deleted file mode 100644
index b6d69f2..0000000
--- a/src/main/java/com/gizwits/opensource/appkit/view/RoundProgressBar.java
+++ /dev/null
@@ -1,266 +0,0 @@
-package com.gizwits.opensource.appkit.view;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.RectF;
-import android.graphics.Typeface;
-import android.util.AttributeSet;
-import android.view.View;
-
-import com.gizwits.opensource.appkit.R;
-import com.gizwits.opensource.appkit.CommonModule.GosDeploy;
-import com.gizwits.opensource.appkit.utils.AssetsUtils;
-
-
-/**
- * 仿iphone带进度的进度条，线程安全的View，可直接在线程中更新进度
- *
- * @author xiaanming
- */
-public class RoundProgressBar extends View {
- /**
- * 画笔对象的引用
- */
- private Paint paint;
-
- /**
- * 圆环的颜色
- */
- private int roundColor;
-
- /**
- * 圆环进度的颜色
- */
- private int roundProgressColor;
-
- /**
- * 中间进度百分比的字符串的颜色
- */
- private int textColor;
-
- /**
- * 中间进度百分比的字符串的字体
- */
- private float textSize;
-
- /**
- * 中间进度的字体
- */
- private String text;
-
- /**
- * 圆环的宽度
- */
- private float roundWidth;
-
- /**
- * 最大进度
- */
- private int max;
-
-
- /**
- * 当前进度
- */
- private float progress;
- /**
- * 是否显示中间的进度
- */
- private boolean textIsDisplayable;
-
- /**
- * 进度的风格，实心或者空心
- */
- private int style;
-
- public static final int STROKE = 0;
- public static final int FILL = 1;
-
- public RoundProgressBar(Context context) {
- this(context, null);
- }
-
- public RoundProgressBar(Context context, AttributeSet attrs) {
- this(context, attrs, 0);
- }
-
- public RoundProgressBar(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
-
- paint = new Paint();
-
- TypedArray mTypedArray = context.obtainStyledAttributes(attrs, R.styleable.RoundProgressBar);
-
- // 获取自定义属性和默认值
- int color = GosDeploy.appConfig_Background();
- roundColor = mTypedArray.getColor(R.styleable.RoundProgressBar_roundColor, getResources().getColor(R.color.roundcolor));
- roundProgressColor = mTypedArray.getColor(R.styleable.RoundProgressBar_roundProgressColor, color);
- textColor = mTypedArray.getColor(R.styleable.RoundProgressBar_textColor, getResources().getColor(R.color.text_state));
- textSize = mTypedArray.getDimension(R.styleable.RoundProgressBar_textSize, AssetsUtils.sptopx(context, 20));
- roundWidth = mTypedArray.getDimension(R.styleable.RoundProgressBar_roundWidth, 3);
- max = mTypedArray.getInteger(R.styleable.RoundProgressBar_max, 100);
- text = mTypedArray.getString(R.styleable.RoundProgressBar_text);
- if (text == null) {
- text = "%";
- }
- textIsDisplayable = mTypedArray.getBoolean(R.styleable.RoundProgressBar_textIsDisplayable, true);
- style = mTypedArray.getInt(R.styleable.RoundProgressBar_style, 0);
-
- mTypedArray.recycle();
- }
-
- @Override
- protected void onDraw(Canvas canvas) {
- super.onDraw(canvas);
-
- /**
- * 画最外层的大圆环
- */
- int centre = getWidth() / 2; // 获取圆心的x坐标
- int radius = (int) (centre - 1 - roundWidth / 2); // 圆环的半径
- paint.setColor(roundColor); // 设置圆环的颜色
- paint.setStyle(Paint.Style.STROKE); // 设置空心
- paint.setStrokeWidth(roundWidth); // 设置圆环的宽度
- paint.setAntiAlias(true); // 消除锯齿
- canvas.drawCircle(centre, centre, radius, paint); // 画出圆环
-
-
- /**
- * 画进度百分比
- */
- paint.setStrokeWidth(0);
- paint.setColor(textColor);
- paint.setTextSize(textSize);
- paint.setTypeface(Typeface.DEFAULT_BOLD); // 设置字体
- if (text.equals("s")) {
- int percent = 180 - (int) progress; // 中间的进度百分比，先转换成float在进行除法运算，不然都为0
-
- float textWidth = paint.measureText(percent + "s"); // 测量字体宽度，我们需要根据字体的宽度设置在圆环中间
-
- if (textIsDisplayable && percent != 0 && style == STROKE) {
- canvas.drawText(percent + "s", centre - textWidth / 2, centre + textSize / 2, paint); // 画出进度百分比
- }
- } else {
- int percent = (int) (((float) progress / (float) max) * 100); // 中间的进度百分比，先转换成float在进行除法运算，不然都为0
- float textWidth = paint.measureText(percent + "%"); // 测量字体宽度，我们需要根据字体的宽度设置在圆环中间
-
- if (textIsDisplayable && percent != 0 && style == STROKE) {
- canvas.drawText(percent + "%", centre - textWidth / 2, centre + textSize / 2, paint); // 画出进度百分比
- }
- }
-
-
- /**
- * 画圆弧 ，画圆环的进度
- */
-
- // 设置进度是实心还是空心
- paint.setStrokeWidth(roundWidth * 2); // 设置圆环的宽度
- paint.setColor(roundProgressColor); // 设置进度的颜色
- paint.setAntiAlias(true); // 消除锯齿
- RectF oval = new RectF(centre - radius + 1.5f, centre - radius + 1.5f, centre + radius - 1.5f,
- centre + radius - 1.5f); // 用于定义的圆弧的形状和大小的界限
-
- switch (style) {
- case STROKE: {
- paint.setStyle(Paint.Style.STROKE);
- canvas.drawArc(oval, -90, 360 * progress / max, false, paint); // 根据进度画圆弧
- break;
- }
- case FILL: {
- paint.setStyle(Paint.Style.FILL_AND_STROKE);
- if (progress != 0)
- canvas.drawArc(oval, -90, 360 * progress / max, true, paint); // 根据进度画圆弧
- break;
- }
- }
-
- }
-
- public synchronized int getMax() {
- return max;
- }
-
- /**
- * 设置进度的最大值
- *
- * @param max
- */
- public synchronized void setMax(int max) {
- if (max < 0) {
- throw new IllegalArgumentException("max not less than 0");
- }
- this.max = max;
- }
-
- /**
- * 获取进度.需要同步
- *
- * @return
- */
- public synchronized float getProgress() {
- return progress;
- }
-
- /**
- * 设置进度，此为线程安全控件，由于考虑多线的问题，需要同步 刷新界面调用postInvalidate()能在非UI线程刷新
- *
- * @param progress
- */
- public synchronized void setProgress(double progress) {
- if (progress < 0) {
- throw new IllegalArgumentException("progress not less than 0");
- }
- if (progress > max) {
- progress = max;
- }
- if (progress <= max) {
- this.progress = (float) progress;
- postInvalidate();
- }
-
- }
-
- public int getCricleColor() {
- return roundColor;
- }
-
- public void setCricleColor(int cricleColor) {
- this.roundColor = cricleColor;
- }
-
- public int getCricleProgressColor() {
- return roundProgressColor;
- }
-
- public void setCricleProgressColor(int cricleProgressColor) {
- this.roundProgressColor = cricleProgressColor;
- }
-
- public int getTextColor() {
- return textColor;
- }
-
- public void setTextColor(int textColor) {
- this.textColor = textColor;
- }
-
- public float getTextSize() {
- return textSize;
- }
-
- public void setTextSize(float textSize) {
- this.textSize = textSize;
- }
-
- public float getRoundWidth() {
- return roundWidth;
- }
-
- public void setRoundWidth(float roundWidth) {
- this.roundWidth = roundWidth;
- }
-
-}
diff --git a/src/main/java/com/gizwits/opensource/appkit/view/SlideListView2.java b/src/main/java/com/gizwits/opensource/appkit/view/SlideListView2.java
deleted file mode 100644
index 671bba6..0000000
--- a/src/main/java/com/gizwits/opensource/appkit/view/SlideListView2.java
+++ /dev/null
@@ -1,309 +0,0 @@
-package com.gizwits.opensource.appkit.view;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.widget.AdapterView;
-import android.widget.ListView;
-import android.widget.Scroller;
-
-/**
- * 侧向滑出菜单的ListView 使用请注意与ListView的Item的布局配合，
- * 该效果的实现是基于在Item的布局中通过设置PaddingLeft和PaddingRight来隐藏左右菜单的，
- * 所以使用此ListView时，请务必在布局Item时使用PaddingLeft和PaddingRight；
- * 或者自己改写此ListView，已达到想要的实现方式
- *
- * @author zhangshuo
- */
-@SuppressLint({"ClickableViewAccessibility", "Recycle"})
-public class SlideListView2 extends ListView {
-
- /**
- * 禁止侧滑模式
- */
- public static int MOD_FORBID = 0;
- /**
- * 从左向右滑出菜单模式
- */
- public static int MOD_LEFT = 1;
- /**
- * 从右向左滑出菜单模式
- */
- public static int MOD_RIGHT = 2;
- /**
- * 左右均可以滑出菜单模式
- */
- public static int MOD_BOTH = 3;
- /**
- * 当前的模式
- */
- private int mode = MOD_FORBID;
- /**
- * 左侧菜单的长度
- */
- private int leftLength = 0;
- /**
- * 右侧菜单的长度
- */
- private int rightLength = 0;
-
- /**
- * 当前滑动的ListView position
- */
- private int slidePosition;
- /**
- * 手指按下X的坐标
- */
- private int downY;
- /**
- * 手指按下Y的坐标
- */
- private int downX;
- /**
- * ListView的item
- */
- private View itemView;
- /**
- * 滑动类
- */
- private Scroller scroller;
- /**
- * 认为是用户滑动的最小距离
- */
- private int mTouchSlop;
-
- /**
- * 判断是否可以侧向滑动
- */
- private boolean canMove = false;
- /**
- * 标示是否完成侧滑
- */
- private boolean isSlided = false;
-
- public SlideListView2(Context context) {
- this(context, null);
- }
-
- public SlideListView2(Context context, AttributeSet attrs) {
- this(context, attrs, 0);
- }
-
- public SlideListView2(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- scroller = new Scroller(context);
- mTouchSlop = ViewConfiguration.get(getContext()).getScaledTouchSlop();
- }
-
- /**
- * 初始化菜单的滑出模式
- *
- * @param mode
- */
- public void initSlideMode(int mode) {
- this.mode = mode;
- }
-
- /**
- * 处理我们拖动ListView item的逻辑
- */
- @Override
- public boolean onTouchEvent(MotionEvent ev) {
-
- final int action = ev.getAction();
- int lastX = (int) ev.getX();
-
- switch (action) {
- case MotionEvent.ACTION_DOWN:
- System.out.println("touch-->" + "down");
-
- /* 当前模式不允许滑动，则直接返回，交给ListView自身去处理 */
- if (this.mode == MOD_FORBID) {
- return super.onTouchEvent(ev);
- }
-
- // 如果处于侧滑完成状态，侧滑回去，并直接返回
- if (isSlided) {
- scrollBack();
- return false;
- }
- // 假如scroller滚动还没有结束，我们直接返回
- if (!scroller.isFinished()) {
- return false;
- }
- downX = (int) ev.getX();
- downY = (int) ev.getY();
-
- slidePosition = pointToPosition(downX, downY);
-
- // 无效的position, 不做任何处理
- if (slidePosition == AdapterView.INVALID_POSITION) {
- return super.onTouchEvent(ev);
- }
-
- // 获取我们点击的item view
- itemView = getChildAt(slidePosition - getFirstVisiblePosition());
-
- /* 此处根据设置的滑动模式，自动获取左侧或右侧菜单的长度 */
- if (this.mode == MOD_BOTH) {
- this.leftLength = -itemView.getPaddingLeft();
- this.rightLength = -itemView.getPaddingRight();
- } else if (this.mode == MOD_LEFT) {
- this.leftLength = -itemView.getPaddingLeft();
- } else if (this.mode == MOD_RIGHT) {
- this.rightLength = -itemView.getPaddingRight();
- }
-
- break;
- case MotionEvent.ACTION_MOVE:
- System.out.println("touch-->" + "move");
-
- if (!canMove && slidePosition != AdapterView.INVALID_POSITION
- && (Math.abs(ev.getX() - downX) > mTouchSlop && Math.abs(ev.getY() - downY) < mTouchSlop)) {
- int offsetX = downX - lastX;
- if (offsetX > 0 && (this.mode == MOD_BOTH || this.mode == MOD_RIGHT)) {
- /* 从右向左滑 */
- canMove = true;
- } /*
- * else if(offsetX < 0 && (this.mode == MOD_BOTH ||
- * this.mode == MOD_LEFT)){ 从左向右滑 canMove = true; }
- */ else {
- canMove = false;
- }
- /* 此段代码是为了避免我们在侧向滑动时同时出发ListView的OnItemClickListener时间 */
- MotionEvent cancelEvent = MotionEvent.obtain(ev);
- cancelEvent.setAction(
- MotionEvent.ACTION_CANCEL | (ev.getActionIndex() << MotionEvent.ACTION_POINTER_INDEX_SHIFT));
- onTouchEvent(cancelEvent);
- }
- if (canMove) {
- /* 设置此属性，可以在侧向滑动时，保持ListView不会上下滚动 */
- requestDisallowInterceptTouchEvent(true);
-
- // 手指拖动itemView滚动, deltaX大于0向左滚动，小于0向右滚
- int deltaX = downX - lastX;
- if (deltaX < 0 && (this.mode == MOD_BOTH || this.mode == MOD_LEFT)) {
- /* 向左滑 */
- itemView.scrollTo(deltaX, 0);
- } else if (deltaX > 0 && (this.mode == MOD_BOTH || this.mode == MOD_RIGHT)) {
- /* 向右滑 */
- itemView.scrollTo(deltaX, 0);
- } else {
- itemView.scrollTo(0, 0);
- }
- return true; // 拖动的时候ListView不滚动
- }
- case MotionEvent.ACTION_UP:
- System.out.println("touch-->" + "up");
- if (canMove) {
- canMove = false;
- scrollByDistanceX();
- }
- break;
- }
-
- // 否则直接交给ListView来处理onTouchEvent事件
- return super.onTouchEvent(ev);
- }
-
- /**
- * 根据手指滚动itemView的距离来判断是滚动到开始位置还是向左或者向右滚动
- */
- private void scrollByDistanceX() {
- /* 当前模式不允许滑动，则直接返回 */
- if (this.mode == MOD_FORBID) {
- return;
- }
- if (itemView.getScrollX() > 0 && (this.mode == MOD_BOTH || this.mode == MOD_RIGHT)) {
- /* 从右向左滑 */
- if (itemView.getScrollX() >= rightLength / 2) {
- scrollLeft();
- } else {
- // 滚回到原始位置
- scrollBack();
- }
- } else if (itemView.getScrollX() < 0 && (this.mode == MOD_BOTH || this.mode == MOD_LEFT)) {
- /* 从左向右滑 */
- if (itemView.getScrollX() <= -leftLength / 2) {
- scrollRight();
- } else {
- // 滚回到原始位置
- scrollBack();
- }
- } else {
- // 滚回到原始位置
- scrollBack();
- }
-
- }
-
- /**
- * 往右滑动，getScrollX()返回的是左边缘的距离，就是以View左边缘为原点到开始滑动的距离，所以向右边滑动为负值
- */
- private void scrollRight() {
- isSlided = true;
- final int delta = (leftLength + itemView.getScrollX());
- // 调用startScroll方法来设置一些滚动的参数，我们在computeScroll()方法中调用scrollTo来滚动item
- scroller.startScroll(itemView.getScrollX(), 0, -delta, 0, Math.abs(delta));
- postInvalidate(); // 刷新itemView
- }
-
- /**
- * 向左滑动，根据上面我们知道向左滑动为正值
- */
- private void scrollLeft() {
- isSlided = true;
- final int delta = (rightLength - itemView.getScrollX());
- // 调用startScroll方法来设置一些滚动的参数，我们在computeScroll()方法中调用scrollTo来滚动item
- scroller.startScroll(itemView.getScrollX(), 0, delta, 0, Math.abs(delta));
- postInvalidate(); // 刷新itemView
- }
-
- /**
- * 滑动会原来的位置
- */
- private void scrollBack() {
- isSlided = false;
- if (itemView != null) {
- scroller.startScroll(itemView.getScrollX(), 0, -itemView.getScrollX(), 0, Math.abs(itemView.getScrollX()));
- }
- postInvalidate(); // 刷新itemView
- }
-
- @Override
- public void computeScroll() {
- // 调用startScroll的时候scroller.computeScrollOffset()返回true，
- if (scroller.computeScrollOffset()) {
- // 让ListView item根据当前的滚动偏移量进行滚动
- itemView.scrollTo(scroller.getCurrX(), scroller.getCurrY());
-
- postInvalidate();
- }
- }
-
- // TODO 此处方法使ListView或GridView与ScrollView相适应
- protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-
- int expandSpec = MeasureSpec.makeMeasureSpec(Integer.MAX_VALUE >> 2,
-
- MeasureSpec.AT_MOST);
-
- super.onMeasure(widthMeasureSpec, expandSpec);
-
- }
-
- /**
- * 提供给外部调用，用以将侧滑出来的滑回去
- */
- public void slideBack() {
- this.scrollBack();
- }
-
- public boolean isSlided() {
- return isSlided;
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/gizwits/opensource/appkit/view/SuperSwipeRefreshLayout.java b/src/main/java/com/gizwits/opensource/appkit/view/SuperSwipeRefreshLayout.java
deleted file mode 100644
index bf9928a..0000000
--- a/src/main/java/com/gizwits/opensource/appkit/view/SuperSwipeRefreshLayout.java
+++ /dev/null
@@ -1,1466 +0,0 @@
-package com.gizwits.opensource.appkit.view;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.ValueAnimator;
-import android.animation.ValueAnimator.AnimatorUpdateListener;
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.RectF;
-import android.os.Build;
-import android.os.Handler;
-import android.support.v4.view.MotionEventCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.widget.NestedScrollView;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.LayoutManager;
-import android.support.v7.widget.StaggeredGridLayoutManager;
-import android.util.AttributeSet;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.view.Display;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.view.animation.Animation;
-import android.view.animation.Animation.AnimationListener;
-import android.view.animation.DecelerateInterpolator;
-import android.view.animation.Transformation;
-import android.widget.AbsListView;
-import android.widget.RelativeLayout;
-import android.widget.ScrollView;
-
-/*
- * @Description 自定义CustomeSwipeRefreshLayout
- * 支持下拉刷新和上拉加载更多
- * 非侵入式，对原来的ListView、RecyclerView没有任何影响,用法和SwipeRefreshLayout类似。
- * 可自定义头部View的样式，调用setHeaderView方法即可
- * 可自定义页尾View的样式，调用setFooterView方法即可
- * 支持RecyclerView，ListView，ScrollView，GridView等等。
- * 被包含的View(RecyclerView,ListView etc.)可跟随手指的滑动而滑动
- * 默认是跟随手指的滑动而滑动，也可以设置为不跟随：setTargetScrollWithLayout(false) 回调方法更多
- * 比如：onRefresh() onPullDistance(int distance)和onPullEnable(boolean
- * enable)
- */
-@SuppressLint("ClickableViewAccessibility")
-public class SuperSwipeRefreshLayout extends ViewGroup {
- private static final String LOG_TAG = "CustomeSwipeRefreshLayout";
- private static final int HEADER_VIEW_HEIGHT = 50;// HeaderView height (dp)
-
- private static final float DECELERATE_INTERPOLATION_FACTOR = 2f;
- private static final int INVALID_POINTER = -1;
- private static final float DRAG_RATE = .5f;
-
- private static final int SCALE_DOWN_DURATION = 150;
- private static final int ANIMATE_TO_TRIGGER_DURATION = 200;
- private static final int ANIMATE_TO_START_DURATION = 200;
- private static final int DEFAULT_CIRCLE_TARGET = 64;
-
- // SuperSwipeRefreshLayout内的目标View，比如RecyclerView,ListView,ScrollView,GridView
- // etc.
- private View mTarget;
-
- private OnPullRefreshListener mListener;// 下拉刷新listener
- private OnPushLoadMoreListener mOnPushLoadMoreListener;// 上拉加载更多
-
- private boolean mRefreshing = false;
- private boolean mLoadMore = false;
- private int mTouchSlop;
- private float mTotalDragDistance = -1;
- private int mMediumAnimationDuration;
- private int mCurrentTargetOffsetTop;
- private boolean mOriginalOffsetCalculated = false;
-
- private float mInitialMotionY;
- private boolean mIsBeingDragged;
- private int mActivePointerId = INVALID_POINTER;
- private boolean mScale;
-
- private boolean mReturningToStart;
- private final DecelerateInterpolator mDecelerateInterpolator;
- private static final int[] LAYOUT_ATTRS = new int[]{android.R.attr.enabled};
-
- private HeadViewContainer mHeadViewContainer;
- private RelativeLayout mFooterViewContainer;
- private int mHeaderViewIndex = -1;
- private int mFooterViewIndex = -1;
-
- protected int mFrom;
-
- private float mStartingScale;
-
- protected int mOriginalOffsetTop;
-
- private Animation mScaleAnimation;
-
- private Animation mScaleDownAnimation;
-
- private Animation mScaleDownToStartAnimation;
-
- // 最后停顿时的偏移量px，与DEFAULT_CIRCLE_TARGET正比
- private float mSpinnerFinalOffset;
-
- private boolean mNotify;
-
- private int mHeaderViewWidth;// headerView的宽度
-
- private int mFooterViewWidth;
-
- private int mHeaderViewHeight;
-
- private int mFooterViewHeight;
-
- private boolean mUsingCustomStart;
-
- private boolean targetScrollWithLayout = true;
-
- private int pushDistance = 0;
-
- private CircleProgressView defaultProgressView = null;
-
- private boolean usingDefaultHeader = true;
-
- private float density = 1.0f;
-
- private boolean isProgressEnable = true;
-
- /**
- * 下拉时，超过距离之后，弹回来的动画监听器
- */
- private AnimationListener mRefreshListener = new AnimationListener() {
- @Override
- public void onAnimationStart(Animation animation) {
- isProgressEnable = false;
- }
-
- @Override
- public void onAnimationRepeat(Animation animation) {
- }
-
- @Override
- public void onAnimationEnd(Animation animation) {
- isProgressEnable = true;
- if (mRefreshing) {
- if (mNotify) {
- if (usingDefaultHeader) {
- ViewCompat.setAlpha(defaultProgressView, 1.0f);
- defaultProgressView.setOnDraw(true);
- new Thread(defaultProgressView).start();
- }
- if (mListener != null) {
- mListener.onRefresh();
- }
- }
- } else {
- mHeadViewContainer.setVisibility(View.GONE);
- if (mScale) {
- setAnimationProgress(0);
- } else {
- setTargetOffsetTopAndBottom(mOriginalOffsetTop
- - mCurrentTargetOffsetTop, true);
- }
- }
- mCurrentTargetOffsetTop = mHeadViewContainer.getTop();
- updateListenerCallBack();
- }
- };
-
- /**
- * 更新回调
- */
- private void updateListenerCallBack() {
- int distance = mCurrentTargetOffsetTop + mHeadViewContainer.getHeight();
- if (mListener != null) {
- mListener.onPullDistance(distance);
- }
- if (usingDefaultHeader && isProgressEnable) {
- defaultProgressView.setPullDistance(distance);
- }
- }
-
- /**
- * 添加头布局
- *
- * @param child
- */
- public void setHeaderView(View child) {
- if (child == null) {
- return;
- }
- if (mHeadViewContainer == null) {
- return;
- }
- usingDefaultHeader = false;
- mHeadViewContainer.removeAllViews();
- RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(
- mHeaderViewWidth, mHeaderViewHeight);
- layoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
- mHeadViewContainer.addView(child, layoutParams);
- }
-
- public void setFooterView(View child) {
- if (child == null) {
- return;
- }
- if (mFooterViewContainer == null) {
- return;
- }
- mFooterViewContainer.removeAllViews();
- RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(
- mFooterViewWidth, mFooterViewHeight);
- mFooterViewContainer.addView(child, layoutParams);
- }
-
- public SuperSwipeRefreshLayout(Context context) {
- this(context, null);
- }
-
- @SuppressWarnings("deprecation")
- public SuperSwipeRefreshLayout(Context context, AttributeSet attrs) {
- super(context, attrs);
-
- /**
- * getScaledTouchSlop是一个距离，表示滑动的时候，手的移动要大于这个距离才开始移动控件。如果小于这个距离就不触发移动控件
- */
- mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
-
- mMediumAnimationDuration = getResources().getInteger(
- android.R.integer.config_mediumAnimTime);
-
- setWillNotDraw(false);
- mDecelerateInterpolator = new DecelerateInterpolator(
- DECELERATE_INTERPOLATION_FACTOR);
-
- final TypedArray a = context
- .obtainStyledAttributes(attrs, LAYOUT_ATTRS);
- setEnabled(a.getBoolean(0, true));
- a.recycle();
-
- WindowManager wm = (WindowManager) context
- .getSystemService(Context.WINDOW_SERVICE);
- Display display = wm.getDefaultDisplay();
- final DisplayMetrics metrics = getResources().getDisplayMetrics();
- mHeaderViewWidth = (int) display.getWidth();
- mFooterViewWidth = (int) display.getWidth();
- mHeaderViewHeight = (int) (HEADER_VIEW_HEIGHT * metrics.density);
- mFooterViewHeight = (int) (HEADER_VIEW_HEIGHT * metrics.density);
- defaultProgressView = new CircleProgressView(getContext());
- createHeaderViewContainer();
- createFooterViewContainer();
- ViewCompat.setChildrenDrawingOrderEnabled(this, true);
- mSpinnerFinalOffset = DEFAULT_CIRCLE_TARGET * metrics.density;
- density = metrics.density;
- mTotalDragDistance = mSpinnerFinalOffset;
- }
-
- /*
- * 孩子节点绘制的顺序
- *
- * @param childCount
- * @param i
- * @return
- */
- @Override
- protected int getChildDrawingOrder(int childCount, int i) {
- // 将新添加的View,放到最后绘制
- if (mHeaderViewIndex < 0 && mFooterViewIndex < 0) {
- return i;
- }
- if (i == childCount - 2) {
- return mHeaderViewIndex;
- }
- if (i == childCount - 1) {
- return mFooterViewIndex;
- }
- int bigIndex = mFooterViewIndex > mHeaderViewIndex ? mFooterViewIndex
- : mHeaderViewIndex;
- int smallIndex = mFooterViewIndex < mHeaderViewIndex ? mFooterViewIndex
- : mHeaderViewIndex;
- if (i >= smallIndex && i < bigIndex - 1) {
- return i + 1;
- }
- if (i >= bigIndex || (i == bigIndex - 1)) {
- return i + 2;
- }
- return i;
- }
-
- /*
- * 创建头布局的容器
- */
- private void createHeaderViewContainer() {
- RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(
- (int) (mHeaderViewHeight * 0.8),
- (int) (mHeaderViewHeight * 0.8));
- layoutParams.addRule(RelativeLayout.CENTER_HORIZONTAL);
- layoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
- mHeadViewContainer = new HeadViewContainer(getContext());
- mHeadViewContainer.setVisibility(View.GONE);
- defaultProgressView.setVisibility(View.VISIBLE);
- defaultProgressView.setOnDraw(false);
- mHeadViewContainer.addView(defaultProgressView, layoutParams);
- addView(mHeadViewContainer);
- }
-
- /*
- * 添加底部布局
- */
- private void createFooterViewContainer() {
- mFooterViewContainer = new RelativeLayout(getContext());
- mFooterViewContainer.setVisibility(View.GONE);
- addView(mFooterViewContainer);
- }
-
- /*
- * 设置
- *
- * @param listener
- */
- public void setOnPullRefreshListener(OnPullRefreshListener listener) {
- mListener = listener;
- }
-
- public void setHeaderViewBackgroundColor(int color) {
- mHeadViewContainer.setBackgroundColor(color);
- }
-
- /*
- * 设置上拉加载更多的接口
- *
- * @param onPushLoadMoreListener
- */
- public void setOnPushLoadMoreListener(
- OnPushLoadMoreListener onPushLoadMoreListener) {
- this.mOnPushLoadMoreListener = onPushLoadMoreListener;
- }
-
- /*
- * Notify the widget that refresh state has changed. Do not call this when
- * refresh is triggered by a swipe gesture.
- *
- * @param refreshing Whether or not the view should show refresh progress.
- */
- public void setRefreshing(boolean refreshing) {
- if (refreshing && mRefreshing != refreshing) {
- // scale and show
- mRefreshing = refreshing;
- int endTarget = 0;
- if (!mUsingCustomStart) {
- endTarget = (int) (mSpinnerFinalOffset + mOriginalOffsetTop);
- } else {
- endTarget = (int) mSpinnerFinalOffset;
- }
- setTargetOffsetTopAndBottom(endTarget - mCurrentTargetOffsetTop,
- true /* requires update */);
- mNotify = false;
- startScaleUpAnimation(mRefreshListener);
- } else {
- setRefreshing(refreshing, false /* notify */);
- if (usingDefaultHeader) {
- defaultProgressView.setOnDraw(false);
- }
- }
- }
-
- private void startScaleUpAnimation(AnimationListener listener) {
- mHeadViewContainer.setVisibility(View.VISIBLE);
- mScaleAnimation = new Animation() {
- @Override
- public void applyTransformation(float interpolatedTime,
- Transformation t) {
- setAnimationProgress(interpolatedTime);
- }
- };
- mScaleAnimation.setDuration(mMediumAnimationDuration);
- if (listener != null) {
- mHeadViewContainer.setAnimationListener(listener);
- }
- mHeadViewContainer.clearAnimation();
- mHeadViewContainer.startAnimation(mScaleAnimation);
- }
-
- private void setAnimationProgress(float progress) {
- if (!usingDefaultHeader) {
- progress = 1;
- }
- ViewCompat.setScaleX(mHeadViewContainer, progress);
- ViewCompat.setScaleY(mHeadViewContainer, progress);
- }
-
- private void setRefreshing(boolean refreshing, final boolean notify) {
- if (mRefreshing != refreshing) {
- mNotify = notify;
- ensureTarget();
- mRefreshing = refreshing;
- if (mRefreshing) {
- animateOffsetToCorrectPosition(mCurrentTargetOffsetTop,
- mRefreshListener);
- } else {
- //startScaleDownAnimation(mRefreshListener);
- animateOffsetToStartPosition(mCurrentTargetOffsetTop, mRefreshListener);
- }
- }
- }
-
- private void startScaleDownAnimation(AnimationListener listener) {
- mScaleDownAnimation = new Animation() {
- @Override
- public void applyTransformation(float interpolatedTime,
- Transformation t) {
- setAnimationProgress(1 - interpolatedTime);
- }
- };
- mScaleDownAnimation.setDuration(SCALE_DOWN_DURATION);
- mHeadViewContainer.setAnimationListener(listener);
- mHeadViewContainer.clearAnimation();
- mHeadViewContainer.startAnimation(mScaleDownAnimation);
- }
-
- public boolean isRefreshing() {
- return mRefreshing;
- }
-
- /**
- * 确保mTarget不为空
- * mTarget一般是可滑动的ScrollView,ListView,RecyclerView等
- */
- private void ensureTarget() {
- if (mTarget == null) {
- for (int i = 0; i < getChildCount(); i++) {
- View child = getChildAt(i);
- if (!child.equals(mHeadViewContainer)
- && !child.equals(mFooterViewContainer)) {
- mTarget = child;
- break;
- }
- }
- }
- }
-
- /**
- * Set the distance to trigger a sync in dips
- *
- * @param distance
- */
- public void setDistanceToTriggerSync(int distance) {
- mTotalDragDistance = distance;
- }
-
- @Override
- protected void onLayout(boolean changed, int left, int top, int right,
- int bottom) {
- final int width = getMeasuredWidth();
- final int height = getMeasuredHeight();
- if (getChildCount() == 0) {
- return;
- }
- if (mTarget == null) {
- ensureTarget();
- }
- if (mTarget == null) {
- return;
- }
- int distance = mCurrentTargetOffsetTop + mHeadViewContainer.getMeasuredHeight();
- if (!targetScrollWithLayout) {
- // 判断标志位，如果目标View不跟随手指的滑动而滑动，将下拉偏移量设置为0
- distance = 0;
- }
- final View child = mTarget;
- final int childLeft = getPaddingLeft();
- final int childTop = getPaddingTop() + distance - pushDistance;// 根据偏移量distance更新
- final int childWidth = width - getPaddingLeft() - getPaddingRight();
- final int childHeight = height - getPaddingTop() - getPaddingBottom();
- Log.d(LOG_TAG, "debug:onLayout childHeight = " + childHeight);
- child.layout(childLeft, childTop, childLeft + childWidth, childTop
- + childHeight);// 更新目标View的位置
- int headViewWidth = mHeadViewContainer.getMeasuredWidth();
- int headViewHeight = mHeadViewContainer.getMeasuredHeight();
- mHeadViewContainer.layout((width / 2 - headViewWidth / 2),
- mCurrentTargetOffsetTop, (width / 2 + headViewWidth / 2),
- mCurrentTargetOffsetTop + headViewHeight);// 更新头布局的位置
- int footViewWidth = mFooterViewContainer.getMeasuredWidth();
- int footViewHeight = mFooterViewContainer.getMeasuredHeight();
- mFooterViewContainer.layout((width / 2 - footViewWidth / 2), height
- - pushDistance, (width / 2 + footViewWidth / 2), height
- + footViewHeight - pushDistance);
- }
-
- @Override
- public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- super.onMeasure(widthMeasureSpec, heightMeasureSpec);
- if (mTarget == null) {
- ensureTarget();
- }
- if (mTarget == null) {
- return;
- }
- mTarget.measure(MeasureSpec.makeMeasureSpec(getMeasuredWidth()
- - getPaddingLeft() - getPaddingRight(), MeasureSpec.EXACTLY),
- MeasureSpec.makeMeasureSpec(getMeasuredHeight()
- - getPaddingTop() - getPaddingBottom(),
- MeasureSpec.EXACTLY));
- mHeadViewContainer.measure(MeasureSpec.makeMeasureSpec(
- mHeaderViewWidth, MeasureSpec.EXACTLY), MeasureSpec
- .makeMeasureSpec(3 * mHeaderViewHeight, MeasureSpec.EXACTLY));
- mFooterViewContainer.measure(MeasureSpec.makeMeasureSpec(
- mFooterViewWidth, MeasureSpec.EXACTLY), MeasureSpec
- .makeMeasureSpec(mFooterViewHeight, MeasureSpec.EXACTLY));
- if (!mUsingCustomStart && !mOriginalOffsetCalculated) {
- mOriginalOffsetCalculated = true;
- mCurrentTargetOffsetTop = mOriginalOffsetTop = -mHeadViewContainer
- .getMeasuredHeight();
- updateListenerCallBack();
- }
- mHeaderViewIndex = -1;
- for (int index = 0; index < getChildCount(); index++) {
- if (getChildAt(index) == mHeadViewContainer) {
- mHeaderViewIndex = index;
- break;
- }
- }
- mFooterViewIndex = -1;
- for (int index = 0; index < getChildCount(); index++) {
- if (getChildAt(index) == mFooterViewContainer) {
- mFooterViewIndex = index;
- break;
- }
- }
- }
-
- /**
- * 判断目标View是否滑动到顶部-还能否继续滑动
- *
- * @return
- */
- public boolean isChildScrollToTop() {
- if (Build.VERSION.SDK_INT < 14) {
- if (mTarget instanceof AbsListView) {
- final AbsListView absListView = (AbsListView) mTarget;
- return !(absListView.getChildCount() > 0 && (absListView
- .getFirstVisiblePosition() > 0 || absListView
- .getChildAt(0).getTop() < absListView.getPaddingTop()));
- } else {
- return !(mTarget.getScrollY() > 0);
- }
- } else {
- return !ViewCompat.canScrollVertically(mTarget, -1);
- }
- }
-
- /**
- * 是否滑动到底部
- *
- * @return
- */
- public boolean isChildScrollToBottom() {
- if (isChildScrollToTop()) {
- return false;
- }
- if (mTarget instanceof RecyclerView) {
- RecyclerView recyclerView = (RecyclerView) mTarget;
- LayoutManager layoutManager = recyclerView.getLayoutManager();
- int count = recyclerView.getAdapter().getItemCount();
- if (layoutManager instanceof LinearLayoutManager && count > 0) {
- LinearLayoutManager linearLayoutManager = (LinearLayoutManager) layoutManager;
- if (linearLayoutManager.findLastCompletelyVisibleItemPosition() == count - 1) {
- return true;
- }
- } else if (layoutManager instanceof StaggeredGridLayoutManager) {
- StaggeredGridLayoutManager staggeredGridLayoutManager = (StaggeredGridLayoutManager) layoutManager;
- int[] lastItems = new int[2];
- staggeredGridLayoutManager
- .findLastCompletelyVisibleItemPositions(lastItems);
- int lastItem = Math.max(lastItems[0], lastItems[1]);
- if (lastItem == count - 1) {
- return true;
- }
- }
- return false;
- } else if (mTarget instanceof AbsListView) {
- final AbsListView absListView = (AbsListView) mTarget;
- int count = absListView.getAdapter().getCount();
- int fristPos = absListView.getFirstVisiblePosition();
- if (fristPos == 0
- && absListView.getChildAt(0).getTop() >= absListView
- .getPaddingTop()) {
- return false;
- }
- int lastPos = absListView.getLastVisiblePosition();
- if (lastPos > 0 && count > 0 && lastPos == count - 1) {
- return true;
- }
- return false;
- } else if (mTarget instanceof ScrollView) {
- ScrollView scrollView = (ScrollView) mTarget;
- View view = (View) scrollView
- .getChildAt(scrollView.getChildCount() - 1);
- if (view != null) {
- int diff = (view.getBottom() - (scrollView.getHeight() + scrollView
- .getScrollY()));
- if (diff == 0) {
- return true;
- }
- }
- } else if (mTarget instanceof NestedScrollView) {
- NestedScrollView nestedScrollView = (NestedScrollView) mTarget;
- View view = (View) nestedScrollView.getChildAt(nestedScrollView.getChildCount() - 1);
- if (view != null) {
- int diff = (view.getBottom() - (nestedScrollView.getHeight() + nestedScrollView.getScrollY()));
- if (diff == 0) {
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- * 主要判断是否应该拦截子View的事件
- * 如果拦截，则交给自己的OnTouchEvent处理
- * 否者，交给子View处理
- */
- @Override
- public boolean onInterceptTouchEvent(MotionEvent ev) {
- ensureTarget();
-
- final int action = MotionEventCompat.getActionMasked(ev);
-
- if (mReturningToStart && action == MotionEvent.ACTION_DOWN) {
- mReturningToStart = false;
- }
- if (!isEnabled() || mReturningToStart || mRefreshing || mLoadMore
- || (!isChildScrollToTop() && !isChildScrollToBottom())) {
- // 如果子View可以滑动，不拦截事件，交给子View处理-下拉刷新
- // 或者子View没有滑动到底部不拦截事件-上拉加载更多
- return false;
- }
-
- // 下拉刷新判断
- switch (action) {
- case MotionEvent.ACTION_DOWN:
- setTargetOffsetTopAndBottom(
- mOriginalOffsetTop - mHeadViewContainer.getTop(), true);// 恢复HeaderView的初始位置
- mActivePointerId = MotionEventCompat.getPointerId(ev, 0);
- mIsBeingDragged = false;
- final float initialMotionY = getMotionEventY(ev, mActivePointerId);
- if (initialMotionY == -1) {
- return false;
- }
- mInitialMotionY = initialMotionY;// 记录按下的位置
-
- case MotionEvent.ACTION_MOVE:
- if (mActivePointerId == INVALID_POINTER) {
- Log.e(LOG_TAG,
- "Got ACTION_MOVE event but don't have an active pointer id.");
- return false;
- }
-
- final float y = getMotionEventY(ev, mActivePointerId);
- if (y == -1) {
- return false;
- }
- float yDiff = 0;
- if (isChildScrollToBottom()) {
- yDiff = mInitialMotionY - y;// 计算上拉距离
- if (yDiff > mTouchSlop && !mIsBeingDragged) {// 判断是否下拉的距离足够
- mIsBeingDragged = true;// 正在上拉
- }
- } else {
- yDiff = y - mInitialMotionY;// 计算下拉距离
- if (yDiff > mTouchSlop && !mIsBeingDragged) {// 判断是否下拉的距离足够
- mIsBeingDragged = true;// 正在下拉
- }
- }
- break;
-
- case MotionEventCompat.ACTION_POINTER_UP:
- onSecondaryPointerUp(ev);
- break;
-
- case MotionEvent.ACTION_UP:
- case MotionEvent.ACTION_CANCEL:
- mIsBeingDragged = false;
- mActivePointerId = INVALID_POINTER;
- break;
- }
-
- return mIsBeingDragged;// 如果正在拖动，则拦截子View的事件
- }
-
- private float getMotionEventY(MotionEvent ev, int activePointerId) {
- final int index = MotionEventCompat.findPointerIndex(ev,
- activePointerId);
- if (index < 0) {
- return -1;
- }
- return MotionEventCompat.getY(ev, index);
- }
-
- @Override
- public void requestDisallowInterceptTouchEvent(boolean b) {
- // Nope.
- }
-
- @Override
- public boolean onTouchEvent(MotionEvent ev) {
- final int action = MotionEventCompat.getActionMasked(ev);
-
- if (mReturningToStart && action == MotionEvent.ACTION_DOWN) {
- mReturningToStart = false;
- }
- if (!isEnabled() || mReturningToStart
- || (!isChildScrollToTop() && !isChildScrollToBottom())) {
- // 如果子View可以滑动，不拦截事件，交给子View处理
- return false;
- }
-
- if (isChildScrollToBottom()) {// 上拉加载更多
- return handlerPushTouchEvent(ev, action);
- } else {// 下拉刷新
- return handlerPullTouchEvent(ev, action);
- }
- }
-
-
- //下拉刷新
- private boolean handlerPullTouchEvent(MotionEvent ev, int action) {
- switch (action) {
- case MotionEvent.ACTION_DOWN:
- mActivePointerId = MotionEventCompat.getPointerId(ev, 0);
- mIsBeingDragged = false;
- break;
-
- case MotionEvent.ACTION_MOVE: {
- final int pointerIndex = MotionEventCompat.findPointerIndex(ev,
- mActivePointerId);
- if (pointerIndex < 0) {
- Log.e(LOG_TAG,
- "Got ACTION_MOVE event but have an invalid active pointer id.");
- return false;
- }
-
- final float y = MotionEventCompat.getY(ev, pointerIndex);
- final float overscrollTop = (y - mInitialMotionY) * DRAG_RATE;
- if (mIsBeingDragged) {
- float originalDragPercent = overscrollTop / mTotalDragDistance;
- if (originalDragPercent < 0) {
- return false;
- }
- float dragPercent = Math.min(1f, Math.abs(originalDragPercent));
- float extraOS = Math.abs(overscrollTop) - mTotalDragDistance;
- float slingshotDist = mUsingCustomStart ? mSpinnerFinalOffset
- - mOriginalOffsetTop : mSpinnerFinalOffset;
- float tensionSlingshotPercent = Math.max(0,
- Math.min(extraOS, slingshotDist * 2) / slingshotDist);
- float tensionPercent = (float) ((tensionSlingshotPercent / 4) - Math
- .pow((tensionSlingshotPercent / 4), 2)) * 2f;
- float extraMove = (slingshotDist) * tensionPercent * 2;
-
- int targetY = mOriginalOffsetTop
- + (int) ((slingshotDist * dragPercent) + extraMove);
- if (mHeadViewContainer.getVisibility() != View.VISIBLE) {
- mHeadViewContainer.setVisibility(View.VISIBLE);
- }
- if (!mScale) {
- ViewCompat.setScaleX(mHeadViewContainer, 1f);
- ViewCompat.setScaleY(mHeadViewContainer, 1f);
- }
- if (usingDefaultHeader) {
- float alpha = overscrollTop / mTotalDragDistance;
- if (alpha >= 1.0f) {
- alpha = 1.0f;
- }
- ViewCompat.setScaleX(defaultProgressView, alpha);
- ViewCompat.setScaleY(defaultProgressView, alpha);
- ViewCompat.setAlpha(defaultProgressView, alpha);
- }
- if (overscrollTop < mTotalDragDistance) {
- if (mScale) {
- setAnimationProgress(overscrollTop / mTotalDragDistance);
- }
- if (mListener != null) {
- mListener.onPullEnable(false);
- }
- } else {
- if (mListener != null) {
- mListener.onPullEnable(true);
- }
- }
- setTargetOffsetTopAndBottom(targetY - mCurrentTargetOffsetTop,
- true);
- }
- break;
- }
- case MotionEventCompat.ACTION_POINTER_DOWN: {
- final int index = MotionEventCompat.getActionIndex(ev);
- mActivePointerId = MotionEventCompat.getPointerId(ev, index);
- break;
- }
-
- case MotionEventCompat.ACTION_POINTER_UP:
- onSecondaryPointerUp(ev);
- break;
-
- case MotionEvent.ACTION_UP:
- case MotionEvent.ACTION_CANCEL: {
- if (mActivePointerId == INVALID_POINTER) {
- if (action == MotionEvent.ACTION_UP) {
- Log.e(LOG_TAG,
- "Got ACTION_UP event but don't have an active pointer id.");
- }
- return false;
- }
- final int pointerIndex = MotionEventCompat.findPointerIndex(ev,
- mActivePointerId);
- final float y = MotionEventCompat.getY(ev, pointerIndex);
- final float overscrollTop = (y - mInitialMotionY) * DRAG_RATE;
- mIsBeingDragged = false;
- if (overscrollTop > mTotalDragDistance) {
- setRefreshing(true, true /* notify */);
- } else {
- mRefreshing = false;
- AnimationListener listener = null;
- if (!mScale) {
- listener = new AnimationListener() {
-
- @Override
- public void onAnimationStart(Animation animation) {
- }
-
- @Override
- public void onAnimationEnd(Animation animation) {
- if (!mScale) {
- startScaleDownAnimation(null);
- }
- }
-
- @Override
- public void onAnimationRepeat(Animation animation) {
- }
-
- };
- }
- animateOffsetToStartPosition(mCurrentTargetOffsetTop, listener);
- }
- mActivePointerId = INVALID_POINTER;
- return false;
- }
- }
-
- return true;
- }
-
- /**
- * 处理上拉加载更多的Touch事件
- *
- * @param ev
- * @param action
- * @return
- */
- private boolean handlerPushTouchEvent(MotionEvent ev, int action) {
- switch (action) {
- case MotionEvent.ACTION_DOWN:
- mActivePointerId = MotionEventCompat.getPointerId(ev, 0);
- mIsBeingDragged = false;
- Log.d(LOG_TAG, "debug:onTouchEvent ACTION_DOWN");
- break;
- case MotionEvent.ACTION_MOVE: {
- final int pointerIndex = MotionEventCompat.findPointerIndex(ev,
- mActivePointerId);
- if (pointerIndex < 0) {
- Log.e(LOG_TAG,
- "Got ACTION_MOVE event but have an invalid active pointer id.");
- return false;
- }
- final float y = MotionEventCompat.getY(ev, pointerIndex);
- final float overscrollBottom = (mInitialMotionY - y) * DRAG_RATE;
- if (mIsBeingDragged) {
- pushDistance = (int) overscrollBottom;
- updateFooterViewPosition();
- if (mOnPushLoadMoreListener != null) {
- mOnPushLoadMoreListener
- .onPushEnable(pushDistance >= mFooterViewHeight);
- }
- }
- break;
- }
- case MotionEventCompat.ACTION_POINTER_DOWN: {
- final int index = MotionEventCompat.getActionIndex(ev);
- mActivePointerId = MotionEventCompat.getPointerId(ev, index);
- break;
- }
-
- case MotionEventCompat.ACTION_POINTER_UP:
- onSecondaryPointerUp(ev);
- break;
-
- case MotionEvent.ACTION_UP:
- case MotionEvent.ACTION_CANCEL: {
- if (mActivePointerId == INVALID_POINTER) {
- if (action == MotionEvent.ACTION_UP) {
- Log.e(LOG_TAG,
- "Got ACTION_UP event but don't have an active pointer id.");
- }
- return false;
- }
- final int pointerIndex = MotionEventCompat.findPointerIndex(ev,
- mActivePointerId);
- final float y = MotionEventCompat.getY(ev, pointerIndex);
- final float overscrollBottom = (mInitialMotionY - y) * DRAG_RATE;// 松手是下拉的距离
- mIsBeingDragged = false;
- mActivePointerId = INVALID_POINTER;
- if (overscrollBottom < mFooterViewHeight
- || mOnPushLoadMoreListener == null) {// 直接取消
- pushDistance = 0;
- } else {// 下拉到mFooterViewHeight
- pushDistance = mFooterViewHeight;
- }
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
- updateFooterViewPosition();
- if (pushDistance == mFooterViewHeight
- && mOnPushLoadMoreListener != null) {
- mLoadMore = true;
- mOnPushLoadMoreListener.onLoadMore();
- }
- } else {
- animatorFooterToBottom((int) overscrollBottom, pushDistance);
- }
- return false;
- }
- }
- return true;
- }
-
- /**
- * 松手之后，使用动画将Footer从距离start变化到end
- *
- * @param start
- * @param end
- */
- @TargetApi(Build.VERSION_CODES.HONEYCOMB)
- private void animatorFooterToBottom(int start, final int end) {
- ValueAnimator valueAnimator = ValueAnimator.ofInt(start, end);
- valueAnimator.setDuration(150);
- valueAnimator.addUpdateListener(new AnimatorUpdateListener() {
-
- @Override
- public void onAnimationUpdate(ValueAnimator valueAnimator) {
- // update
- pushDistance = (Integer) valueAnimator.getAnimatedValue();
- updateFooterViewPosition();
- }
- });
- valueAnimator.addListener(new AnimatorListenerAdapter() {
- @Override
- public void onAnimationEnd(Animator animation) {
- if (end > 0 && mOnPushLoadMoreListener != null) {
- // start loading more
- mLoadMore = true;
- mOnPushLoadMoreListener.onLoadMore();
- } else {
- resetTargetLayout();
- mLoadMore = false;
- }
- }
- });
- valueAnimator.setInterpolator(mDecelerateInterpolator);
- valueAnimator.start();
- }
-
- /**
- * 设置停止加载
- *
- * @param loadMore
- */
- public void setLoadMore(boolean loadMore) {
- if (!loadMore && mLoadMore) {// 停止加载
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
- mLoadMore = false;
- pushDistance = 0;
- updateFooterViewPosition();
- } else {
- animatorFooterToBottom(mFooterViewHeight, 0);
- }
- }
- }
-
- private void animateOffsetToCorrectPosition(int from,
- AnimationListener listener) {
- mFrom = from;
- mAnimateToCorrectPosition.reset();
- mAnimateToCorrectPosition.setDuration(ANIMATE_TO_TRIGGER_DURATION);
- mAnimateToCorrectPosition.setInterpolator(mDecelerateInterpolator);
- if (listener != null) {
- mHeadViewContainer.setAnimationListener(listener);
- }
- mHeadViewContainer.clearAnimation();
- mHeadViewContainer.startAnimation(mAnimateToCorrectPosition);
- }
-
- private void animateOffsetToStartPosition(int from,
- AnimationListener listener) {
- if (mScale) {
- startScaleDownReturnToStartAnimation(from, listener);
- } else {
- mFrom = from;
- mAnimateToStartPosition.reset();
- mAnimateToStartPosition.setDuration(ANIMATE_TO_START_DURATION);
- mAnimateToStartPosition.setInterpolator(mDecelerateInterpolator);
- if (listener != null) {
- mHeadViewContainer.setAnimationListener(listener);
- }
- mHeadViewContainer.clearAnimation();
- mHeadViewContainer.startAnimation(mAnimateToStartPosition);
- }
- resetTargetLayoutDelay(ANIMATE_TO_START_DURATION);
- }
-
- /**
- * 重置Target位置
- *
- * @param delay
- */
- public void resetTargetLayoutDelay(int delay) {
- new Handler().postDelayed(new Runnable() {
-
- @Override
- public void run() {
- resetTargetLayout();
- }
- }, delay);
- }
-
- /**
- * 重置Target的位置
- */
- public void resetTargetLayout() {
- final int width = getMeasuredWidth();
- final int height = getMeasuredHeight();
- final View child = mTarget;
- final int childLeft = getPaddingLeft();
- final int childTop = getPaddingTop();
- final int childWidth = child.getWidth() - getPaddingLeft()
- - getPaddingRight();
- final int childHeight = child.getHeight() - getPaddingTop()
- - getPaddingBottom();
- child.layout(childLeft, childTop, childLeft + childWidth, childTop
- + childHeight);
-
- int headViewWidth = mHeadViewContainer.getMeasuredWidth();
- int headViewHeight = mHeadViewContainer.getMeasuredHeight();
- mHeadViewContainer.layout((width / 2 - headViewWidth / 2),
- -headViewHeight, (width / 2 + headViewWidth / 2), 0);// 更新头布局的位置
- int footViewWidth = mFooterViewContainer.getMeasuredWidth();
- int footViewHeight = mFooterViewContainer.getMeasuredHeight();
- mFooterViewContainer.layout((width / 2 - footViewWidth / 2), height,
- (width / 2 + footViewWidth / 2), height + footViewHeight);
- }
-
- private final Animation mAnimateToCorrectPosition = new Animation() {
- @Override
- public void applyTransformation(float interpolatedTime, Transformation t) {
- int targetTop = 0;
- int endTarget = 0;
- if (!mUsingCustomStart) {
- endTarget = (int) (mSpinnerFinalOffset - Math
- .abs(mOriginalOffsetTop));
- } else {
- endTarget = (int) mSpinnerFinalOffset;
- }
- targetTop = (mFrom + (int) ((endTarget - mFrom) * interpolatedTime));
- int offset = targetTop - mHeadViewContainer.getTop();
- setTargetOffsetTopAndBottom(offset, false /* requires update */);
- }
-
- @Override
- public void setAnimationListener(AnimationListener listener) {
- super.setAnimationListener(listener);
- }
- };
-
- private void moveToStart(float interpolatedTime) {
- int targetTop = 0;
- targetTop = (mFrom + (int) ((mOriginalOffsetTop - mFrom) * interpolatedTime));
- int offset = targetTop - mHeadViewContainer.getTop();
- setTargetOffsetTopAndBottom(offset, false /* requires update */);
- }
-
- private final Animation mAnimateToStartPosition = new Animation() {
- @Override
- public void applyTransformation(float interpolatedTime, Transformation t) {
- moveToStart(interpolatedTime);
- }
- };
-
- private void startScaleDownReturnToStartAnimation(int from,
- AnimationListener listener) {
- mFrom = from;
- mStartingScale = ViewCompat.getScaleX(mHeadViewContainer);
- mScaleDownToStartAnimation = new Animation() {
- @Override
- public void applyTransformation(float interpolatedTime,
- Transformation t) {
- float targetScale = (mStartingScale + (-mStartingScale * interpolatedTime));
- setAnimationProgress(targetScale);
- moveToStart(interpolatedTime);
- }
- };
- mScaleDownToStartAnimation.setDuration(SCALE_DOWN_DURATION);
- if (listener != null) {
- mHeadViewContainer.setAnimationListener(listener);
- }
- mHeadViewContainer.clearAnimation();
- mHeadViewContainer.startAnimation(mScaleDownToStartAnimation);
- }
-
- private void setTargetOffsetTopAndBottom(int offset, boolean requiresUpdate) {
- mHeadViewContainer.bringToFront();
- mHeadViewContainer.offsetTopAndBottom(offset);
- mCurrentTargetOffsetTop = mHeadViewContainer.getTop();
- if (requiresUpdate && Build.VERSION.SDK_INT < 11) {
- invalidate();
- }
- updateListenerCallBack();
- }
-
- /**
- * 修改底部布局的位置-敏感pushDistance
- */
- private void updateFooterViewPosition() {
- mFooterViewContainer.setVisibility(View.VISIBLE);
- mFooterViewContainer.bringToFront();
- //针对4.4及之前版本的兼容
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
- mFooterViewContainer.getParent().requestLayout();
- }
- mFooterViewContainer.offsetTopAndBottom(-pushDistance);
- updatePushDistanceListener();
- }
-
- private void updatePushDistanceListener() {
- if (mOnPushLoadMoreListener != null) {
- mOnPushLoadMoreListener.onPushDistance(pushDistance);
- }
- }
-
- private void onSecondaryPointerUp(MotionEvent ev) {
- final int pointerIndex = MotionEventCompat.getActionIndex(ev);
- final int pointerId = MotionEventCompat.getPointerId(ev, pointerIndex);
- if (pointerId == mActivePointerId) {
- final int newPointerIndex = pointerIndex == 0 ? 1 : 0;
- mActivePointerId = MotionEventCompat.getPointerId(ev,
- newPointerIndex);
- }
- }
-
- /**
- * @Description 下拉刷新布局头部的容器
- */
- private class HeadViewContainer extends RelativeLayout {
-
- private AnimationListener mListener;
-
- public HeadViewContainer(Context context) {
- super(context);
- }
-
- public void setAnimationListener(AnimationListener listener) {
- mListener = listener;
- }
-
- @Override
- public void onAnimationStart() {
- super.onAnimationStart();
- if (mListener != null) {
- mListener.onAnimationStart(getAnimation());
- }
- }
-
- @Override
- public void onAnimationEnd() {
- super.onAnimationEnd();
- if (mListener != null) {
- mListener.onAnimationEnd(getAnimation());
- }
- }
- }
-
- /**
- * 判断子View是否跟随手指的滑动而滑动，默认跟随
- *
- * @return
- */
- public boolean isTargetScrollWithLayout() {
- return targetScrollWithLayout;
- }
-
- /**
- * 设置子View是否跟谁手指的滑动而滑动
- *
- * @param targetScrollWithLayout
- */
- public void setTargetScrollWithLayout(boolean targetScrollWithLayout) {
- this.targetScrollWithLayout = targetScrollWithLayout;
- }
-
- /**
- * 下拉刷新回调
- */
- public interface OnPullRefreshListener {
- public void onRefresh();
-
- public void onPullDistance(int distance);
-
- public void onPullEnable(boolean enable);
- }
-
- /**
- * 上拉加载更多
- */
- public interface OnPushLoadMoreListener {
- public void onLoadMore();
-
- public void onPushDistance(int distance);
-
- public void onPushEnable(boolean enable);
- }
-
- /**
- * Adapter
- */
- public class OnPullRefreshListenerAdapter implements OnPullRefreshListener {
-
- @Override
- public void onRefresh() {
-
- }
-
- @Override
- public void onPullDistance(int distance) {
-
- }
-
- @Override
- public void onPullEnable(boolean enable) {
-
- }
-
- }
-
- public class OnPushLoadMoreListenerAdapter implements
- OnPushLoadMoreListener {
-
- @Override
- public void onLoadMore() {
-
- }
-
- @Override
- public void onPushDistance(int distance) {
-
- }
-
- @Override
- public void onPushEnable(boolean enable) {
-
- }
-
- }
-
- /**
- * 设置默认下拉刷新进度条的颜色
- *
- * @param color
- */
- public void setDefaultCircleProgressColor(int color) {
- if (usingDefaultHeader) {
- defaultProgressView.setProgressColor(color);
- }
- }
-
- /**
- * 设置圆圈的背景色
- *
- * @param color
- */
- public void setDefaultCircleBackgroundColor(int color) {
- if (usingDefaultHeader) {
- defaultProgressView.setCircleBackgroundColor(color);
- }
- }
-
- public void setDefaultCircleShadowColor(int color) {
- if (usingDefaultHeader) {
- defaultProgressView.setShadowColor(color);
- }
- }
-
- /**
- * 默认的下拉刷新样式
- */
- public class CircleProgressView extends View implements Runnable {
-
- private static final int PEROID = 16;// 绘制周期
- private Paint progressPaint;
- private Paint bgPaint;
- private int width;// view的高度
- private int height;// view的宽度
-
- private boolean isOnDraw = false;
- private boolean isRunning = false;
- private int startAngle = 0;
- private int speed = 8;
- private RectF ovalRect = null;
- private RectF bgRect = null;
- private int swipeAngle;
- private int progressColor = 0xffcccccc;
- private int circleBackgroundColor = 0xffffffff;
- private int shadowColor = 0xff999999;
-
- public CircleProgressView(Context context) {
- super(context);
- }
-
- public CircleProgressView(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public CircleProgressView(Context context, AttributeSet attrs,
- int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- }
-
- @Override
- protected void onDraw(Canvas canvas) {
- super.onDraw(canvas);
- canvas.drawArc(getBgRect(), 0, 360, false, createBgPaint());
- int index = startAngle / 360;
- if (index % 2 == 0) {
- swipeAngle = (startAngle % 720) / 2;
- } else {
- swipeAngle = 360 - (startAngle % 720) / 2;
- }
- canvas.drawArc(getOvalRect(), startAngle, swipeAngle, false,
- createPaint());
- }
-
- private RectF getBgRect() {
- width = getWidth();
- height = getHeight();
- if (bgRect == null) {
- int offset = (int) (density * 2);
- bgRect = new RectF(offset, offset, width - offset, height
- - offset);
- }
- return bgRect;
- }
-
- private RectF getOvalRect() {
- width = getWidth();
- height = getHeight();
- if (ovalRect == null) {
- int offset = (int) (density * 8);
- ovalRect = new RectF(offset, offset, width - offset, height
- - offset);
- }
- return ovalRect;
- }
-
- public void setProgressColor(int progressColor) {
- this.progressColor = progressColor;
- }
-
- public void setCircleBackgroundColor(int circleBackgroundColor) {
- this.circleBackgroundColor = circleBackgroundColor;
- }
-
- public void setShadowColor(int shadowColor) {
- this.shadowColor = shadowColor;
- }
-
- /**
- * 根据画笔的颜色，创建画笔
- *
- * @return
- */
- private Paint createPaint() {
- if (this.progressPaint == null) {
- progressPaint = new Paint();
- progressPaint.setStrokeWidth((int) (density * 3));
- progressPaint.setStyle(Paint.Style.STROKE);
- progressPaint.setAntiAlias(true);
- }
- progressPaint.setColor(progressColor);
- return progressPaint;
- }
-
- private Paint createBgPaint() {
- if (this.bgPaint == null) {
- bgPaint = new Paint();
- bgPaint.setColor(circleBackgroundColor);
- bgPaint.setStyle(Paint.Style.FILL);
- bgPaint.setAntiAlias(true);
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
- this.setLayerType(LAYER_TYPE_SOFTWARE, bgPaint);
- }
- bgPaint.setShadowLayer(4.0f, 0.0f, 2.0f, shadowColor);
- }
- return bgPaint;
- }
-
- public void setPullDistance(int distance) {
- this.startAngle = distance * 2;
- postInvalidate();
- }
-
- @Override
- public void run() {
- while (isOnDraw) {
- isRunning = true;
- long startTime = System.currentTimeMillis();
- startAngle += speed;
- postInvalidate();
- long time = System.currentTimeMillis() - startTime;
- if (time < PEROID) {
- try {
- Thread.sleep(PEROID - time);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
- }
-
- public void setOnDraw(boolean isOnDraw) {
- this.isOnDraw = isOnDraw;
- }
-
- public void setSpeed(int speed) {
- this.speed = speed;
- }
-
- public boolean isRunning() {
- return isRunning;
- }
-
- @Override
- public void onWindowFocusChanged(boolean hasWindowFocus) {
- super.onWindowFocusChanged(hasWindowFocus);
- }
-
- @Override
- protected void onDetachedFromWindow() {
- isOnDraw = false;
- super.onDetachedFromWindow();
- }
-
- }
-
-}
diff --git a/src/main/java/com/gizwits/opensource/appkit/view/SwitchView.java b/src/main/java/com/gizwits/opensource/appkit/view/SwitchView.java
deleted file mode 100644
index d9f4ba7..0000000
--- a/src/main/java/com/gizwits/opensource/appkit/view/SwitchView.java
+++ /dev/null
@@ -1,473 +0,0 @@
-package com.gizwits.opensource.appkit.view;
-
-
-/**
- * Created by qiaoning on 2017/8/16.
- */
-
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.graphics.RadialGradient;
-import android.graphics.RectF;
-import android.graphics.Shader;
-import android.os.Build;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.util.AttributeSet;
-import android.util.TypedValue;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.animation.AccelerateInterpolator;
-
-import com.gizwits.opensource.appkit.R;
-
-
-public class SwitchView extends View {
-
-
- private final int DEFAULT_COLOR_PRIMARY = 0xFF4BD763;
- private final int DEFAULT_COLOR_PRIMARY_DARK = 0xFF3AC652;
- private final float RATIO_ASPECT = 0.68f;
- private final float ANIMATION_SPEED = 0.1f; // (0,1]
- private static final int STATE_SWITCH_ON = 4; // you change value you die
- private static final int STATE_SWITCH_ON2 = 3;
- private static final int STATE_SWITCH_OFF2 = 2;
- private static final int STATE_SWITCH_OFF = 1;
-
- private final AccelerateInterpolator interpolator = new AccelerateInterpolator(2);
- private final Paint paint = new Paint();
- private final Path sPath = new Path();
- private final Path bPath = new Path();
- private final RectF bRectF = new RectF();
- private float sAnim, bAnim;
- private RadialGradient shadowGradient;
-
- private int state;
- private int lastState;
- private boolean isCanVisibleDrawing = false;
- private OnClickListener mOnClickListener;
- private int colorPrimary;
- private int colorPrimaryDark;
- private boolean hasShadow;
- private boolean isOpened;
-
- private int mWidth, mHeight;
- private int actuallyDrawingAreaLeft;
- private int actuallyDrawingAreaRight;
- private int actuallyDrawingAreaTop;
- private int actuallyDrawingAreaBottom;
-
- private float sWidth, sHeight;
- private float sLeft, sTop, sRight, sBottom;
- private float sCenterX, sCenterY;
- private float sScale;
-
- private float bOffset;
- private float bRadius, bStrokeWidth;
- private float bWidth;
- private float bLeft, bTop, bRight, bBottom;
- private float bOnLeftX, bOn2LeftX, bOff2LeftX, bOffLeftX;
-
- private float shadowReservedHeight;
-
- public SwitchView(Context context) {
- this(context, null);
- }
-
- @TargetApi(Build.VERSION_CODES.HONEYCOMB)
- public SwitchView(Context context, AttributeSet attrs) {
- super(context, attrs);
- setLayerType(LAYER_TYPE_SOFTWARE, null);
-
- TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SwitchView);
- colorPrimary = a.getColor(R.styleable.SwitchView_primaryColor, DEFAULT_COLOR_PRIMARY);
- colorPrimaryDark = a.getColor(R.styleable.SwitchView_primaryColorDark, DEFAULT_COLOR_PRIMARY_DARK);
- hasShadow = a.getBoolean(R.styleable.SwitchView_hasShadow, true);
- isOpened = a.getBoolean(R.styleable.SwitchView_isOpened, false);
- state = isOpened ? STATE_SWITCH_ON : STATE_SWITCH_OFF;
- lastState = state;
- a.recycle();
-
- if (colorPrimary == DEFAULT_COLOR_PRIMARY && colorPrimaryDark == DEFAULT_COLOR_PRIMARY_DARK) {
- try {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
- TypedValue primaryColorTypedValue = new TypedValue();
- context.getTheme().resolveAttribute(android.R.attr.colorPrimary, primaryColorTypedValue, true);
- if (primaryColorTypedValue.data > 0) colorPrimary = primaryColorTypedValue.data;
- TypedValue primaryColorDarkTypedValue = new TypedValue();
- context.getTheme().resolveAttribute(android.R.attr.colorPrimaryDark, primaryColorDarkTypedValue, true);
- if (primaryColorDarkTypedValue.data > 0)
- colorPrimaryDark = primaryColorDarkTypedValue.data;
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- public void setColor(int newColorPrimary, int newColorPrimaryDark) {
- colorPrimary = newColorPrimary;
- colorPrimaryDark = newColorPrimaryDark;
- invalidate();
- }
-
- public void setShadow(boolean shadow) {
- hasShadow = shadow;
- invalidate();
- }
-
- public boolean isOpened() {
- return isOpened;
- }
-
- public void setOpened(boolean isOpened) {
- int wishState = isOpened ? STATE_SWITCH_ON : STATE_SWITCH_OFF;
- if (wishState == state) {
- return;
- }
- refreshState(wishState);
- }
-
- public void toggleSwitch(boolean isOpened) {
- int wishState = isOpened ? STATE_SWITCH_ON : STATE_SWITCH_OFF;
- if (wishState == state) {
- return;
- }
- if ((wishState == STATE_SWITCH_ON && (state == STATE_SWITCH_OFF || state == STATE_SWITCH_OFF2))
- || (wishState == STATE_SWITCH_OFF && (state == STATE_SWITCH_ON || state == STATE_SWITCH_ON2))) {
- sAnim = 1;
- }
- bAnim = 1;
- refreshState(wishState);
- }
-
- private void refreshState(int newState) {
- if (!isOpened && newState == STATE_SWITCH_ON) {
- isOpened = true;
- } else if (isOpened && newState == STATE_SWITCH_OFF) {
- isOpened = false;
- }
- lastState = state;
- state = newState;
- postInvalidate();
- }
-
- @Override
- protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- int widthSize = MeasureSpec.getSize(widthMeasureSpec);
- int widthMode = MeasureSpec.getMode(widthMeasureSpec);
- int resultWidth;
- if (widthMode == MeasureSpec.EXACTLY) {
- resultWidth = widthSize;
- } else {
- resultWidth = (int) (56 * getResources().getDisplayMetrics().density + 0.5f)
- + getPaddingLeft() + getPaddingRight();
- if (widthMode == MeasureSpec.AT_MOST) {
- resultWidth = Math.min(resultWidth, widthSize);
- }
- }
-
- int heightSize = MeasureSpec.getSize(heightMeasureSpec);
- int heightMode = MeasureSpec.getMode(heightMeasureSpec);
- int resultHeight;
- if (heightMode == MeasureSpec.EXACTLY) {
- resultHeight = heightSize;
- } else {
- int selfExpectedResultHeight = (int) (resultWidth * RATIO_ASPECT) + getPaddingTop() + getPaddingBottom();
- resultHeight = selfExpectedResultHeight;
- if (heightMode == MeasureSpec.AT_MOST) {
- resultHeight = Math.min(resultHeight, heightSize);
- }
- }
- setMeasuredDimension(resultWidth, resultHeight);
- }
-
- @Override
- protected void onSizeChanged(int w, int h, int oldw, int oldh) {
- super.onSizeChanged(w, h, oldw, oldh);
- mWidth = w;
- mHeight = h;
- isCanVisibleDrawing = mWidth > getPaddingLeft() + getPaddingRight() && mHeight > getPaddingTop() + getPaddingBottom();
-
- if (isCanVisibleDrawing) {
- int actuallyDrawingAreaWidth = mWidth - getPaddingLeft() - getPaddingRight();
- int actuallyDrawingAreaHeight = mHeight - getPaddingTop() - getPaddingBottom();
-
- if (actuallyDrawingAreaWidth * RATIO_ASPECT < actuallyDrawingAreaHeight) {
- actuallyDrawingAreaLeft = getPaddingLeft();
- actuallyDrawingAreaRight = mWidth - getPaddingRight();
- int heightExtraSize = (int) (actuallyDrawingAreaHeight - actuallyDrawingAreaWidth * RATIO_ASPECT);
- actuallyDrawingAreaTop = getPaddingTop() + heightExtraSize / 2;
- actuallyDrawingAreaBottom = getHeight() - getPaddingBottom() - heightExtraSize / 2;
- } else {
- int widthExtraSize = (int) (actuallyDrawingAreaWidth - actuallyDrawingAreaHeight / RATIO_ASPECT);
- actuallyDrawingAreaLeft = getPaddingLeft() + widthExtraSize / 2;
- actuallyDrawingAreaRight = getWidth() - getPaddingRight() - widthExtraSize / 2;
- actuallyDrawingAreaTop = getPaddingTop();
- actuallyDrawingAreaBottom = getHeight() - getPaddingBottom();
- }
-
- shadowReservedHeight = (int) ((actuallyDrawingAreaBottom - actuallyDrawingAreaTop) * 0.09f);
- sLeft = actuallyDrawingAreaLeft;
- sTop = actuallyDrawingAreaTop + shadowReservedHeight;
- sRight = actuallyDrawingAreaRight;
- sBottom = actuallyDrawingAreaBottom - shadowReservedHeight;
-
- sWidth = sRight - sLeft;
- sHeight = sBottom - sTop;
- sCenterX = (sRight + sLeft) / 2;
- sCenterY = (sBottom + sTop) / 2;
-
- bLeft = sLeft;
- bTop = sTop;
- bBottom = sBottom;
- bWidth = sBottom - sTop;
- bRight = sLeft + bWidth;
- final float halfHeightOfS = bWidth / 2; // OfB
- bRadius = halfHeightOfS * 0.95f;
- bOffset = bRadius * 0.2f; // offset of switching
- bStrokeWidth = (halfHeightOfS - bRadius) * 2;
- bOnLeftX = sRight - bWidth;
- bOn2LeftX = bOnLeftX - bOffset;
- bOffLeftX = sLeft;
- bOff2LeftX = bOffLeftX + bOffset;
- sScale = 1 - bStrokeWidth / sHeight;
-
- sPath.reset();
- RectF sRectF = new RectF();
- sRectF.top = sTop;
- sRectF.bottom = sBottom;
- sRectF.left = sLeft;
- sRectF.right = sLeft + sHeight;
- sPath.arcTo(sRectF, 90, 180);
- sRectF.left = sRight - sHeight;
- sRectF.right = sRight;
- sPath.arcTo(sRectF, 270, 180);
- sPath.close();
-
- bRectF.left = bLeft;
- bRectF.right = bRight;
- bRectF.top = bTop + bStrokeWidth / 2;
- bRectF.bottom = bBottom - bStrokeWidth / 2;
- float bCenterX = (bRight + bLeft) / 2;
- float bCenterY = (bBottom + bTop) / 2;
-
- shadowGradient = new RadialGradient(bCenterX, bCenterY, bRadius, 0xff000000, 0x00000000, Shader.TileMode.CLAMP);
- }
- }
-
- private void calcBPath(float percent) {
- bPath.reset();
- bRectF.left = bLeft + bStrokeWidth / 2;
- bRectF.right = bRight - bStrokeWidth / 2;
- bPath.arcTo(bRectF, 90, 180);
- bRectF.left = bLeft + percent * bOffset + bStrokeWidth / 2;
- bRectF.right = bRight + percent * bOffset - bStrokeWidth / 2;
- bPath.arcTo(bRectF, 270, 180);
- bPath.close();
- }
-
- private float calcBTranslate(float percent) {
- float result = 0;
- switch (state - lastState) {
- case 1:
- if (state == STATE_SWITCH_OFF2) {
- result = bOffLeftX; // off -> off2
- } else if (state == STATE_SWITCH_ON) {
- result = bOnLeftX - (bOnLeftX - bOn2LeftX) * percent; // on2 -> on
- }
- break;
- case 2:
- if (state == STATE_SWITCH_ON) {
- result = bOnLeftX - (bOnLeftX - bOffLeftX) * percent; // off2 -> on
- } else if (state == STATE_SWITCH_ON) {
- result = bOn2LeftX - (bOn2LeftX - bOffLeftX) * percent; // off -> on2
- }
- break;
- case 3:
- result = bOnLeftX - (bOnLeftX - bOffLeftX) * percent; // off -> on
- break;
- case -1:
- if (state == STATE_SWITCH_ON2) {
- result = bOn2LeftX + (bOnLeftX - bOn2LeftX) * percent; // on -> on2
- } else if (state == STATE_SWITCH_OFF) {
- result = bOffLeftX; // off2 -> off
- }
- break;
- case -2:
- if (state == STATE_SWITCH_OFF) {
- result = bOffLeftX + (bOn2LeftX - bOffLeftX) * percent; // on2 -> off
- } else if (state == STATE_SWITCH_OFF2) {
- result = bOff2LeftX + (bOnLeftX - bOff2LeftX) * percent; // on -> off2
- }
- break;
- case -3:
- result = bOffLeftX + (bOnLeftX - bOffLeftX) * percent; // on -> off
- break;
- default: // init
- case 0:
- if (state == STATE_SWITCH_OFF) {
- result = bOffLeftX; // off -> off
- } else if (state == STATE_SWITCH_ON) {
- result = bOnLeftX; // on -> on
- }
- break;
- }
- return result - bOffLeftX;
- }
-
- @Override
- protected void onDraw(Canvas canvas) {
- super.onDraw(canvas);
- if (!isCanVisibleDrawing) return;
-
- paint.setAntiAlias(true);
- final boolean isOn = (state == STATE_SWITCH_ON || state == STATE_SWITCH_ON2);
- // Draw background
- paint.setStyle(Paint.Style.FILL);
- paint.setColor(isOn ? colorPrimary : 0xffE3E3E3);
- canvas.drawPath(sPath, paint);
-
- sAnim = sAnim - ANIMATION_SPEED > 0 ? sAnim - ANIMATION_SPEED : 0;
- bAnim = bAnim - ANIMATION_SPEED > 0 ? bAnim - ANIMATION_SPEED : 0;
-
- final float dsAnim = interpolator.getInterpolation(sAnim);
- final float dbAnim = interpolator.getInterpolation(bAnim);
- // Draw background animation
- final float scale = sScale * (isOn ? dsAnim : 1 - dsAnim);
- final float scaleOffset = (sRight - sCenterX - bRadius) * (isOn ? 1 - dsAnim : dsAnim);
- canvas.save();
- canvas.scale(scale, scale, sCenterX + scaleOffset, sCenterY);
- paint.setColor(0xFFFFFFFF);
- canvas.drawPath(sPath, paint);
- canvas.restore();
- // To prepare center bar path
- canvas.save();
- canvas.translate(calcBTranslate(dbAnim), shadowReservedHeight);
- final boolean isState2 = (state == STATE_SWITCH_ON2 || state == STATE_SWITCH_OFF2);
- calcBPath(isState2 ? 1 - dbAnim : dbAnim);
- // Use center bar path to draw shadow
- if (hasShadow) {
- paint.setStyle(Paint.Style.FILL);
- paint.setColor(0xFF333333);
- paint.setShader(shadowGradient);
- canvas.drawPath(bPath, paint);
- paint.setShader(null);
- }
- canvas.translate(0, -shadowReservedHeight);
- // draw bar
- canvas.scale(0.98f, 0.98f, bWidth / 2, bWidth / 2);
- paint.setStyle(Paint.Style.FILL);
- paint.setColor(0xffffffff);
- canvas.drawPath(bPath, paint);
- paint.setStyle(Paint.Style.STROKE);
- paint.setStrokeWidth(bStrokeWidth * 0.5f);
- paint.setColor(isOn ? colorPrimaryDark : 0xFFBFBFBF);
- canvas.drawPath(bPath, paint);
- canvas.restore();
-
- paint.reset();
- if (sAnim > 0 || bAnim > 0) invalidate();
- }
-
- @Override
- public boolean onTouchEvent(MotionEvent event) {
- if ((state == STATE_SWITCH_ON || state == STATE_SWITCH_OFF) && (sAnim * bAnim == 0)) {
- switch (event.getAction()) {
- case MotionEvent.ACTION_DOWN:
- return true;
- case MotionEvent.ACTION_UP:
- lastState = state;
-
- bAnim = 1;
- if (state == STATE_SWITCH_OFF) {
- refreshState(STATE_SWITCH_OFF2);
- listener.toggleToOn(this);
- } else if (state == STATE_SWITCH_ON) {
- refreshState(STATE_SWITCH_ON2);
- listener.toggleToOff(this);
- }
-
- if (mOnClickListener != null) {
- mOnClickListener.onClick(this);
- }
- break;
- }
- }
- return super.onTouchEvent(event);
- }
-
- @Override
- public void setOnClickListener(OnClickListener l) {
- super.setOnClickListener(l);
- mOnClickListener = l;
- }
-
- public interface OnStateChangedListener {
- void toggleToOn(SwitchView view);
-
- void toggleToOff(SwitchView view);
- }
-
- private OnStateChangedListener listener = new OnStateChangedListener() {
- @Override
- public void toggleToOn(SwitchView view) {
- toggleSwitch(true);
- }
-
- @Override
- public void toggleToOff(SwitchView view) {
- toggleSwitch(false);
- }
- };
-
- public void setOnStateChangedListener(OnStateChangedListener listener) {
- if (listener == null) throw new IllegalArgumentException("empty listener");
- this.listener = listener;
- }
-
- @Override
- public Parcelable onSaveInstanceState() {
- Parcelable superState = super.onSaveInstanceState();
- SavedState ss = new SavedState(superState);
- ss.isOpened = isOpened;
- return ss;
- }
-
- @Override
- public void onRestoreInstanceState(Parcelable state) {
- SavedState ss = (SavedState) state;
- super.onRestoreInstanceState(ss.getSuperState());
- this.isOpened = ss.isOpened;
- this.state = this.isOpened ? STATE_SWITCH_ON : STATE_SWITCH_OFF;
- invalidate();
- }
-
- @SuppressLint("ParcelCreator")
- static final class SavedState extends BaseSavedState {
- private boolean isOpened;
-
- SavedState(Parcelable superState) {
- super(superState);
- }
-
- private SavedState(Parcel in) {
- super(in);
- isOpened = 1 == in.readInt();
- }
-
- @Override
- public void writeToParcel(Parcel out, int flags) {
- super.writeToParcel(out, flags);
- out.writeInt(isOpened ? 1 : 0);
- }
- }
-
-
-}
diff --git a/src/main/java/com/gizwits/opensource/appkit/view/VerticalSwipeRefreshLayout.java b/src/main/java/com/gizwits/opensource/appkit/view/VerticalSwipeRefreshLayout.java
deleted file mode 100644
index 92b3c24..0000000
--- a/src/main/java/com/gizwits/opensource/appkit/view/VerticalSwipeRefreshLayout.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gizwits.opensource.appkit.view;
-
-import android.content.Context;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.ViewConfiguration;
-
-public class VerticalSwipeRefreshLayout extends SwipeRefreshLayout {
- private int mTouchSlop;
- // 上一次触摸时的X坐标
- private float mPrevX;
-
- public VerticalSwipeRefreshLayout(Context context, AttributeSet attrs) {
- super(context, attrs);
-
- // 触发移动事件的最短距离，如果小于这个距离就不触发移动控件
- mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
- }
-
- @Override
- public boolean onInterceptTouchEvent(MotionEvent event) {
-
- switch (event.getAction()) {
- case MotionEvent.ACTION_DOWN:
- mPrevX = event.getX();
- break;
-
- case MotionEvent.ACTION_MOVE:
- final float eventX = event.getX();
- float xDiff = Math.abs(eventX - mPrevX);
- // Log.d("refresh" ,"move----" + eventX + " " + mPrevX + " " +
- // mTouchSlop);
- // 增加60的容差，让下拉刷新在竖直滑动时就可以触发
- if (xDiff > mTouchSlop + 60) {
- return false;
- }
- }
-
- return super.onInterceptTouchEvent(event);
- }
-}
diff --git a/src/main/java/com/gizwits/opensource/appkit/view/ViewPagerIndicator.java b/src/main/java/com/gizwits/opensource/appkit/view/ViewPagerIndicator.java
deleted file mode 100644
index d3931b8..0000000
--- a/src/main/java/com/gizwits/opensource/appkit/view/ViewPagerIndicator.java
+++ /dev/null
@@ -1,415 +0,0 @@
-package com.gizwits.opensource.appkit.view;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.CornerPathEffect;
-import android.graphics.Paint;
-import android.graphics.Paint.Style;
-import android.graphics.Path;
-import android.support.v4.view.ViewPager;
-import android.support.v4.view.ViewPager.OnPageChangeListener;
-import android.util.AttributeSet;
-import android.util.DisplayMetrics;
-import android.util.TypedValue;
-import android.view.Gravity;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.gizwits.opensource.appkit.CommonModule.GosDeploy;
-import com.gizwits.opensource.appkit.R;
-
-import java.util.List;
-
-/**
- * http://blog.csdn.net/lmj623565791/article/details/42160391
- *
- * @author zhy
- */
-public class ViewPagerIndicator extends LinearLayout {
- /**
- * 绘制三角形的画笔
- */
- private Paint mPaint;
- /**
- * path构成一个三角形
- */
- private Path mPath;
- /**
- * 线的宽度
- */
- private int mTriangleWidth;
- /**
- * 线的高度
- */
- private int mTriangleHeight;
-
- /**
- * 三角形的宽度为单个Tab的1/6
- */
- //private static final float RADIO_TRIANGEL = 1.0f / 6;
- /**
- * 线的最大宽度
- */
- private final int DIMENSION_TRIANGEL_WIDTH = (int) (getScreenWidth() / 2);
-
- /**
- * 初始时，线指示器的偏移量
- */
- private int mInitTranslationX;
- /**
- * 手指滑动时的偏移量
- */
- private float mTranslationX;
-
- /**
- * 默认的Tab数量
- */
- private static final int COUNT_DEFAULT_TAB = 2;
- /**
- * tab数量
- */
- private int mTabVisibleCount = 2;
-
- /**
- * tab上的内容
- */
- private List mTabTitles;
- /**
- * 与之绑定的ViewPager
- */
- public ViewPager mViewPager;
-
- /**
- * 标题正常时的颜色（并没有使用 使用的是getContext().getResources().getColor(R.color.text_color) ）
- */
- private static final int COLOR_TEXT_NORMAL = 0xFFC6CBCC;
- /**
- * 标题选中时的颜色
- */
- private static final int COLOR_TEXT_HIGHLIGHTCOLOR = 0xFFFF9A23;
-
- public ViewPagerIndicator(Context context) {
- this(context, null);
- }
-
- public ViewPagerIndicator(Context context, AttributeSet attrs) {
- super(context, attrs);
-
- // 获得自定义属性，tab的数量
- mTabVisibleCount = 2;
- if (mTabVisibleCount < 0)
- mTabVisibleCount = COUNT_DEFAULT_TAB;
-
- // 初始化画笔
- mPaint = new Paint();
- mPaint.setAntiAlias(true);
-// mPaint.setColor(Color.parseColor("#ffff9a23"));
-// mPaint.setColor(getContext().getResources().getColor(R.color.yellow));
- mPaint.setColor(GosDeploy.appConfig_Background());
- mPaint.setStyle(Style.FILL);
- mPaint.setPathEffect(new CornerPathEffect(3));
-
- }
-
- /**
- * 绘制指示器
- */
- @Override
- protected void dispatchDraw(Canvas canvas) {
- canvas.save();
-
-
- // 画笔平移到正确的位置
- canvas.translate(mInitTranslationX + mTranslationX, getHeight() + 1);
- Path path = new Path();
- int height = 6;
- path.moveTo(-(mInitTranslationX + mTranslationX), 0);
- path.lineTo(getScreenWidth(), 0);
- path.lineTo(getScreenWidth(), -height);
- path.lineTo(-(mInitTranslationX + mTranslationX), -height);
- path.close();
- mPaint.setColor(getResources().getColor(R.color.background_color));
- canvas.drawPath(path, mPaint);
-
- //mPaint.setColor(getResources().getColor(R.color.yellow));
- mPaint.setColor(GosDeploy.appConfig_Background());
- canvas.drawPath(mPath, mPaint);
-
- canvas.restore();
-
- super.dispatchDraw(canvas);
- }
-
- /**
- * 初始化三角形的宽度
- */
- @Override
- protected void onSizeChanged(int w, int h, int oldw, int oldh) {
- super.onSizeChanged(w, h, oldw, oldh);
- mTriangleWidth = (int) (w / mTabVisibleCount);// 1/6 of
- // width
- mTriangleWidth = Math.min(DIMENSION_TRIANGEL_WIDTH, mTriangleWidth);
-
- // 初始化三角形
- initTriangle();
-
- // 初始时的偏移量
- mInitTranslationX = getWidth() / mTabVisibleCount / 2 - mTriangleWidth
- / 2;
- }
-
- /**
- * 设置可见的tab的数量
- *
- * @param count
- */
- public void setVisibleTabCount(int count) {
- this.mTabVisibleCount = count;
- }
-
- /**
- * 设置tab的标题内容 可选，可以自己在布局文件中写死
- *
- * @param datas
- */
- public void setTabItemTitles(List datas) {
- // 如果传入的list有值，则移除布局文件中设置的view
- if (datas != null && datas.size() > 0) {
- this.removeAllViews();
- this.mTabTitles = datas;
-
- for (String title : mTabTitles) {
- // 添加view
- addView(generateTextView(title));
- }
- // 设置item的click事件
- setItemClickEvent();
- }
-
- }
-
- /**
- * 对外的ViewPager的回调接口
- *
- * @author zhy
- */
- public interface PageChangeListener {
- public void onPageScrolled(int position, float positionOffset,
- int positionOffsetPixels);
-
- public void onPageSelected(int position);
-
- public void onPageScrollStateChanged(int state);
- }
-
- // 对外的ViewPager的回调接口
- private PageChangeListener onPageChangeListener;
-
- // 对外的ViewPager的回调接口的设置
- public void setOnPageChangeListener(PageChangeListener pageChangeListener) {
- this.onPageChangeListener = pageChangeListener;
- }
-
- // 设置关联的ViewPager
- public void setViewPager(ViewPager mViewPager, int pos) {
- this.mViewPager = mViewPager;
-
- mViewPager.setOnPageChangeListener(new OnPageChangeListener() {
- @Override
- public void onPageSelected(int position) {
- // 设置字体颜色高亮
- resetTextViewColor();
- highLightTextView(position);
-
- // 回调
- if (onPageChangeListener != null) {
- onPageChangeListener.onPageSelected(position);
- }
- }
-
- @Override
- public void onPageScrolled(int position, float positionOffset,
- int positionOffsetPixels) {
- // 滚动
- scroll(position, positionOffset);
-
- // 回调
- if (onPageChangeListener != null) {
- onPageChangeListener.onPageScrolled(position,
- positionOffset, positionOffsetPixels);
- }
-
- }
-
- @Override
- public void onPageScrollStateChanged(int state) {
- // 回调
- if (onPageChangeListener != null) {
- onPageChangeListener.onPageScrollStateChanged(state);
- }
-
- }
- });
- // 设置当前页
- mViewPager.setCurrentItem(pos);
- // 高亮
- highLightTextView(pos);
- }
-
- /**
- * 高亮文本
- *
- * @param position
- */
- protected void highLightTextView(int position) {
- View view = getChildAt(position);
- if (view instanceof TextView) {
- ((TextView) view).setTextColor(getContext().getResources().getColor(R.color.text_color));
- }
-
- }
-
- /**
- * 重置文本颜色
- */
- private void resetTextViewColor() {
- for (int i = 0; i < getChildCount(); i++) {
- View view = getChildAt(i);
- if (view instanceof TextView) {
- ((TextView) view).setTextColor(getContext().getResources().getColor(R.color.text_state));
- }
- }
- }
-
- /**
- * 设置点击事件
- */
- public void setItemClickEvent() {
- int cCount = getChildCount();
- for (int i = 0; i < cCount; i++) {
- final int j = i;
- View view = getChildAt(i);
- view.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- mViewPager.setCurrentItem(j);
- }
- });
- }
- }
-
- /**
- * 根据标题生成我们的TextView
- *
- * @param text
- * @return
- */
- private TextView generateTextView(String text) {
- TextView tv = new TextView(getContext());
- LayoutParams lp = new LayoutParams(
- LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
- lp.width = getScreenWidth() / mTabVisibleCount;
- lp.bottomMargin = 25;
- lp.topMargin = 15;
- tv.setGravity(Gravity.CENTER);
- tv.setTextColor(getContext().getResources().getColor(R.color.text_state));
- tv.setText(text);
- tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15);
- tv.setLayoutParams(lp);
- return tv;
- }
-
- /**
- * 初始化三角形指示器
- */
- private void initTriangle() {
- mPath = new Path();
-
- mTriangleHeight = 10;
- mPath.moveTo(0, 0);
- mPath.lineTo(mTriangleWidth, 0);
- mPath.lineTo(mTriangleWidth, -mTriangleHeight);
- mPath.lineTo(0, -mTriangleHeight);
- mPath.close();
- }
-
- private void initLine() {
-
- }
-
-
- /**
- * 指示器跟随手指滚动，以及容器滚动
- *
- * @param position
- * @param offset
- */
- public void scroll(int position, float offset) {
- /**
- *
- * 0-1:position=0 ;1-0:postion=0;
- *
- */
- // 不断改变偏移量，invalidate
- mTranslationX = getWidth() / mTabVisibleCount * (position + offset);
-
- int tabWidth = getScreenWidth() / mTabVisibleCount;
-
- // 容器滚动，当移动到倒数最后一个的时候，开始滚动
- if (offset > 0 && position >= (mTabVisibleCount - 2)
- && getChildCount() > mTabVisibleCount) {
- if (mTabVisibleCount != 1) {
- this.scrollTo((position - (mTabVisibleCount - 2)) * tabWidth
- + (int) (tabWidth * offset), 0);
- } else
- // 为count为1时 的特殊处理
- {
- this.scrollTo(
- position * tabWidth + (int) (tabWidth * offset), 0);
- }
- }
-
- invalidate();
- }
-
- /**
- * 设置布局中view的一些必要属性；如果设置了setTabTitles，布局中view则无效
- */
- @Override
- protected void onFinishInflate() {
- super.onFinishInflate();
-
- int cCount = getChildCount();
-
- if (cCount == 0)
- return;
-
- for (int i = 0; i < cCount; i++) {
- View view = getChildAt(i);
- LayoutParams lp = (LayoutParams) view
- .getLayoutParams();
- lp.weight = 0;
- lp.width = getScreenWidth() / mTabVisibleCount;
- view.setLayoutParams(lp);
- }
- // 设置点击事件
- setItemClickEvent();
-
- }
-
- /**
- * 获得屏幕的宽度
- *
- * @return
- */
- public int getScreenWidth() {
- WindowManager wm = (WindowManager) getContext().getSystemService(
- Context.WINDOW_SERVICE);
- DisplayMetrics outMetrics = new DisplayMetrics();
- wm.getDefaultDisplay().getMetrics(outMetrics);
- return outMetrics.widthPixels;
- }
-
-}
diff --git a/src/main/java/com/gizwits/opensource/appkit/wxapi/.DS_Store b/src/main/java/com/gizwits/opensource/appkit/wxapi/.DS_Store
deleted file mode 100644
index f4fc62e..0000000
Binary files a/src/main/java/com/gizwits/opensource/appkit/wxapi/.DS_Store and /dev/null differ
diff --git a/src/main/java/com/gizwits/opensource/appkit/wxapi/WXEntryActivity.java b/src/main/java/com/gizwits/opensource/appkit/wxapi/WXEntryActivity.java
deleted file mode 100644
index 4b55ea3..0000000
--- a/src/main/java/com/gizwits/opensource/appkit/wxapi/WXEntryActivity.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.gizwits.opensource.appkit.wxapi;
-
-import android.os.Bundle;
-import android.os.Message;
-import android.util.Log;
-
-import com.gizwits.gizwifisdk.enumration.GizThirdAccountType;
-import com.gizwits.opensource.appkit.CommonModule.GosBaseActivity;
-import com.gizwits.opensource.appkit.CommonModule.GosDeploy;
-import com.gizwits.opensource.appkit.UserModule.GosUserLoginActivity;
-import com.tencent.mm.sdk.modelbase.BaseReq;
-import com.tencent.mm.sdk.modelbase.BaseResp;
-import com.tencent.mm.sdk.modelmsg.SendAuth;
-import com.tencent.mm.sdk.openapi.IWXAPI;
-import com.tencent.mm.sdk.openapi.IWXAPIEventHandler;
-import com.tencent.mm.sdk.openapi.WXAPIFactory;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-
-public class WXEntryActivity extends GosBaseActivity implements IWXAPIEventHandler {
-
- private static final String TAG = "WXEntryActivity";
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- IWXAPI api = WXAPIFactory.createWXAPI(this, GosDeploy.appConfig_WechatAppID(), true);
- api.handleIntent(getIntent(), this);
- }
-
- @Override
- public void onReq(BaseReq req) {
- Log.i(TAG, "onReq...");
- }
-
- @Override
- public void onResp(BaseResp resp) {
- Log.i(TAG, "onResp: " + resp);
- String code = null;
- switch (resp.errCode) {
- case BaseResp.ErrCode.ERR_OK:// 用户同意,只有这种情况的时候code是有效的
- code = ((SendAuth.Resp) resp).code;
- Log.i("Apptest", code);
- try {
- requesUserInfo(code);
- } catch (Exception e) {
- e.printStackTrace();
- }
- break;
- case BaseResp.ErrCode.ERR_AUTH_DENIED:// 用户拒绝授权
- Log.i("Apptest", "用户拒绝授权");
- break;
- case BaseResp.ErrCode.ERR_USER_CANCEL:// 用户取消
- Log.i("Apptest", "用户取消");
- break;
-
- default:// 发送返回
-
- break;
- }
- finish();
- }
-
- public void requesUserInfo(final String code) throws Exception {
- final String path = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=" + GosDeploy.appConfig_WechatAppID()
- + "&secret=" + GosDeploy.appConfig_WechatAppSecret() + "&code=" + code
- + "&grant_type=authorization_code";
- final android.os.Handler handler = new android.os.Handler() {
- public void handleMessage(Message msg) {
- super.handleMessage(msg);
- Bundle b = msg.getData();
- String newsTemp = b.getString("msg");
- try {
- JSONObject jsonObject = new JSONObject(newsTemp);
- if (null != jsonObject) {
- String openid = jsonObject.getString("openid").toString().trim();
- String access_token = jsonObject.getString("access_token").toString().trim();
-
- GosUserLoginActivity.gizThirdAccountType = GizThirdAccountType.GizThirdWeChat;
- GosUserLoginActivity.thirdToken = access_token;
- GosUserLoginActivity.thirdUid = openid;
-
- Message msg1 = new Message();
- msg1.what = GosUserLoginActivity.handler_key.THRED_LOGIN.ordinal();
- baseHandler.sendMessage(msg1);
-
- }
- } catch (JSONException e) {
- e.printStackTrace();
- }
- }
-
- };
-
- new Thread(new Runnable() {
- @Override
- public void run() {
- BufferedReader br = null;
- try {
- URL url = new URL(path);
- HttpURLConnection httpconn = (HttpURLConnection) url.openConnection();
- httpconn.setRequestProperty("accept", "*/*");
- httpconn.setDoInput(true);
- httpconn.setDoOutput(true);
- httpconn.setConnectTimeout(5000);
- httpconn.connect();
- int stat = 200;
- String msg = "";
- if (stat == 200) {
- br = new BufferedReader(new InputStreamReader(httpconn.getInputStream()));
- msg = br.readLine();
- Bundle b = new Bundle();
- b.putString("msg", msg);
- Message m = new Message();
- m.setData(b);
- handler.sendMessage(m);
- } else {
- msg = "请求失败";
- Log.i(TAG, msg);
- }
- } catch (MalformedURLException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- if (br != null) {
- try {
- br.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- }
- }).start();
- }
-
-}
-
diff --git a/src/main/java/zxing/CaptureActivity.java b/src/main/java/zxing/CaptureActivity.java
deleted file mode 100644
index 0a2cbac..0000000
--- a/src/main/java/zxing/CaptureActivity.java
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- * Copyright (C) 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package zxing;
-
-import android.annotation.SuppressLint;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.graphics.Rect;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.Window;
-import android.view.WindowManager;
-import android.view.animation.Animation;
-import android.view.animation.TranslateAnimation;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.gizwits.opensource.appkit.R;
-import com.gizwits.opensource.appkit.CommonModule.GosBaseActivity;
-import com.gizwits.opensource.appkit.DeviceModule.GosDeviceListFragment;
-import com.google.zxing.Result;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-
-import zxing.camera.CameraManager;
-import zxing.decoding.DecodeThread;
-import zxing.utils.CaptureActivityHandler;
-import zxing.utils.InactivityTimer;
-
-/**
- * This activity opens the camera and does the actual scanning on a background
- * thread. It draws a viewfinder to help the user place the barcode correctly,
- * shows feedback as the image processing is happening, and then overlays the
- * results when a scan is successful.
- *
- * @author dswitkin@google.com (Daniel Switkin)
- * @author Sean Owen
- */
-public final class CaptureActivity extends GosBaseActivity implements SurfaceHolder.Callback {
-
- private static final String TAG = CaptureActivity.class.getSimpleName();
-
- private CameraManager cameraManager;
- private CaptureActivityHandler handler;
- private InactivityTimer inactivityTimer;
-
- private SurfaceView scanPreview = null;
- private RelativeLayout scanContainer;
- private RelativeLayout scanCropView;
- private ImageView scanLine;
- private Button btnCancel;
- private ImageView ivReturn;
- // private String uid, token, mac, productKey, productSecret;
- private String did, passcode, product_key;
- private TextView tvDeviceCode;
- private boolean isSetting = false;
-
- /**
- * ClassName: Enum handler_key.
- *
- * date: 2014-11-26 17:51:10
- *
- * @author Lien
- */
- private enum handler_key {
-
- START_BIND,
- SEND_CODE
- }
-
- /**
- * The handler.
- */
- @SuppressLint("HandlerLeak")
- Handler mHandler = new Handler() {
- public void handleMessage(Message msg) {
- super.handleMessage(msg);
- handler_key key = handler_key.values()[msg.what];
- switch (key) {
-
- case START_BIND:
- String[] strings = (String[]) msg.obj;
- for (String string : strings) {
- GosDeviceListFragment.boundMessage.add(string);
- }
- finish();
- break;
- case SEND_CODE:
- String s = (String) msg.obj;
- Intent intent = new Intent();
- intent.putExtra("code", s);
- setResult(33, intent);
- finish();
- break;
-
- }
- }
- };
-
- private Rect mCropRect = null;
-
- public Handler getHandler() {
- return handler;
- }
-
- public CameraManager getCameraManager() {
- return cameraManager;
- }
-
- private boolean isHasSurface = false;
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- /**
- * 设置为竖屏
- */
- if (getRequestedOrientation() != ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
- setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
- }
-
- Window window = getWindow();
- window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
- setContentView(R.layout.activity_gos_capture);
-
- scanPreview = (SurfaceView) findViewById(R.id.capture_preview);
- scanContainer = (RelativeLayout) findViewById(R.id.capture_container);
- scanCropView = (RelativeLayout) findViewById(R.id.capture_crop_view);
- scanLine = (ImageView) findViewById(R.id.capture_scan_line);
- tvDeviceCode = (TextView) findViewById(R.id.tvDeviceCode);
-
- inactivityTimer = new InactivityTimer(this);
-
- TranslateAnimation animation = new TranslateAnimation(Animation.RELATIVE_TO_PARENT, 0.0f,
- Animation.RELATIVE_TO_PARENT, 0.0f, Animation.RELATIVE_TO_PARENT, -1.0f, Animation.RELATIVE_TO_PARENT,
- 0.0f);
- animation.setDuration(4500);
- animation.setRepeatCount(-1);
- animation.setRepeatMode(Animation.RESTART);
- scanLine.startAnimation(animation);
-
- btnCancel = (Button) findViewById(R.id.btn_cancel);
- ivReturn = (ImageView) findViewById(R.id.iv_return);
- OnClickListener myClick = new OnClickListener() {
- @Override
- public void onClick(View arg0) {
- CaptureActivity.this.finish();
- }
- };
- btnCancel.setOnClickListener(myClick);
- ivReturn.setOnClickListener(myClick);
- isSetting = getIntent().getBooleanExtra("isSetting", false);
- }
-
- @Override
- public void onResume() {
- super.onResume();
-
- // CameraManager must be initialized here, not in onCreate(). This is
- // necessary because we don't
- // want to open the camera driver and measure the screen size if we're
- // going to show the help on
- // first launch. That led to bugs where the scanning rectangle was the
- // wrong size and partially
- // off screen.
- cameraManager = new CameraManager(getApplication());
-
- handler = null;
-
- if (isHasSurface) {
- // The activity was paused but not stopped, so the surface still
- // exists. Therefore
- // surfaceCreated() won't be called, so init the camera here.
- initCamera(scanPreview.getHolder());
- } else {
- // Install the callback and wait for surfaceCreated() to init the
- // camera.
- scanPreview.getHolder().addCallback(this);
- }
-
- inactivityTimer.onResume();
- }
-
- @Override
- public void onPause() {
- if (handler != null) {
- handler.quitSynchronously();
- handler = null;
- }
- inactivityTimer.onPause();
- cameraManager.closeDriver();
- if (!isHasSurface) {
- scanPreview.getHolder().removeCallback(this);
- }
- super.onPause();
- }
-
- @Override
- protected void onDestroy() {
- inactivityTimer.shutdown();
- super.onDestroy();
- }
-
- @Override
- public void onBackPressed() {
- super.onBackPressed();
- overridePendingTransition(R.anim.in_from_left, R.anim.out_to_right);
- }
-
- @Override
- public void surfaceCreated(SurfaceHolder holder) {
- if (holder == null) {
- Log.i(TAG, "*** WARNING *** surfaceCreated() gave us a null surface!");
- }
- if (!isHasSurface) {
- isHasSurface = true;
- initCamera(holder);
- }
- }
-
- @Override
- public void surfaceDestroyed(SurfaceHolder holder) {
- isHasSurface = false;
- }
-
- @Override
- public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-
- }
-
- /**
- * A valid barcode has been found, so give an indication of success and show
- * the results.
- *
- * @param rawResult The contents of the barcode.
- * @param bundle The extras
- */
- public void handleDecode(Result rawResult, Bundle bundle) {
- String text = rawResult.getText();
- boolean isJson = false;
- try {
- JSONObject jsonObject = new JSONObject(text);
- isJson = true;
- } catch(JSONException e) {
- e.printStackTrace();
- }
- Message msg = new Message();
- if (isSetting) {
- if (isJson) {
- msg.what = handler_key.SEND_CODE.ordinal();
- msg.obj = text;
- mHandler.sendMessage(msg);
- } else {
- Toast.makeText(this, getString(R.string.code_invalid), Toast.LENGTH_LONG).show();
- }
- } else {
- if (text.contains("product_key=") && text.contains("did=") && text.contains("passcode=")) {
- inactivityTimer.onActivity();
- product_key = getParamFomeUrl(text, "product_key");
- did = getParamFomeUrl(text, "did");
- passcode = getParamFomeUrl(text, "passcode");
- String[] strings = {did, passcode};
- msg.what = handler_key.START_BIND.ordinal();
- msg.obj = strings;
- mHandler.sendMessage(msg);
- Log.e(TAG, "handleDecode-------: " + strings);
- } else if (text.contains("type=") && text.contains("code=")) {
- //type=xxx & code=xxx
- String[] split = text.split("&");
- String[] split2 = split[1].split("=");
- final String code = split2[1];
- String[] strings = {"", "", code};
-
- msg.what = handler_key.START_BIND.ordinal();
- msg.obj = strings;
- mHandler.sendMessage(msg);
- } else {
- // handler = new CaptureActivityHandler(this, cameraManager,
- // DecodeThread.ALL_MODE);
- String[] strings = {text};
- msg.what = handler_key.START_BIND.ordinal();
- msg.obj = strings;
- mHandler.sendMessage(msg);
- }
- }
- }
-
-
- private String getParamFomeUrl(String url, String param) {
- String product_key = "";
- int startindex = url.indexOf(param + "=");
- startindex += (param.length() + 1);
- String subString = url.substring(startindex);
- int endindex = subString.indexOf("&");
- if (endindex == -1) {
- product_key = subString;
- } else {
- product_key = subString.substring(0, endindex);
- }
- return product_key;
- }
-
- private void initCamera(SurfaceHolder surfaceHolder) {
- if (surfaceHolder == null) {
- throw new IllegalStateException("No SurfaceHolder provided");
- }
- if (cameraManager.isOpen()) {
- Log.w(TAG, "initCamera() while already open -- late SurfaceView callback?");
- return;
- }
- try {
- cameraManager.openDriver(surfaceHolder);
- // Creating the handler starts the preview, which can also throw a
- // RuntimeException.
- if (handler == null) {
- handler = new CaptureActivityHandler(this, cameraManager, DecodeThread.ALL_MODE);
- }
-
- initCrop();
- } catch(IOException ioe) {
- Log.w(TAG, ioe);
- displayFrameworkBugMessageAndExit();
- } catch(RuntimeException e) {
- // Barcode Scanner has seen crashes in the wild of this variety:
- // java.?lang.?RuntimeException: Fail to connect to camera service
- Log.w(TAG, "Unexpected error initializing camera", e);
- displayFrameworkBugMessageAndExit();
- }
- }
-
- private void displayFrameworkBugMessageAndExit() {
- // camera error
- AlertDialog.Builder builder = new AlertDialog.Builder(this);
- builder.setTitle(getString(R.string.app_name));
- String camera_error = getText(R.string.camera_error).toString();
- builder.setMessage(camera_error);
- String shure = getText(R.string.besure).toString();
- builder.setPositiveButton(shure, new DialogInterface.OnClickListener() {
-
- @Override
- public void onClick(DialogInterface dialog, int which) {
- finish();
- }
-
- });
- builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
-
- @Override
- public void onCancel(DialogInterface dialog) {
- finish();
- }
- });
- builder.show();
- }
-
- public void restartPreviewAfterDelay(long delayMS) {
- if (handler != null) {
- handler.sendEmptyMessageDelayed(R.id.restart_preview, delayMS);
- }
- }
-
- public Rect getCropRect() {
- return mCropRect;
- }
-
- /**
- * 初始化截取的矩形区域
- */
- private void initCrop() {
- int cameraWidth = cameraManager.getCameraResolution().y;
- int cameraHeight = cameraManager.getCameraResolution().x;
-
- /** 获取布局中扫描框的位置信息 */
- int[] location = new int[2];
- scanCropView.getLocationInWindow(location);
-
- int cropLeft = location[0];
- int cropTop = location[1] - getStatusBarHeight();
-
- int cropWidth = scanCropView.getWidth();
- int cropHeight = scanCropView.getHeight();
-
- /** 获取布局容器的宽高 */
- int containerWidth = scanContainer.getWidth();
- int containerHeight = scanContainer.getHeight();
-
- /** 计算最终截取的矩形的左上角顶点x坐标 */
- int x = cropLeft * cameraWidth / containerWidth;
- /** 计算最终截取的矩形的左上角顶点y坐标 */
- int y = cropTop * cameraHeight / containerHeight;
-
- /** 计算最终截取的矩形的宽度 */
- int width = cropWidth * cameraWidth / containerWidth;
- /** 计算最终截取的矩形的高度 */
- int height = cropHeight * cameraHeight / containerHeight;
-
- /** 生成最终的截取的矩形 */
- mCropRect = new Rect(x, y, width + x, height + y);
- }
-
- private int getStatusBarHeight() {
- try {
- Class c = Class.forName("com.android.internal.R$dimen");
- Object obj = c.newInstance();
- Field field = c.getField("status_bar_height");
- int x = Integer.parseInt(field.get(obj).toString());
- return getResources().getDimensionPixelSize(x);
- } catch(Exception e) {
- e.printStackTrace();
- }
- return 0;
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/zxing/camera/AutoFocusManager.java b/src/main/java/zxing/camera/AutoFocusManager.java
deleted file mode 100644
index 914bfc8..0000000
--- a/src/main/java/zxing/camera/AutoFocusManager.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2012 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package zxing.camera;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.concurrent.RejectedExecutionException;
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.hardware.*;
-import android.os.AsyncTask;
-import android.os.Build;
-import android.util.Log;
-
-public class AutoFocusManager implements Camera.AutoFocusCallback {
-
- private static final String TAG = AutoFocusManager.class.getSimpleName();
-
- private static final long AUTO_FOCUS_INTERVAL_MS = 2000L;
- private static final Collection FOCUS_MODES_CALLING_AF;
-
- static {
- FOCUS_MODES_CALLING_AF = new ArrayList(2);
- FOCUS_MODES_CALLING_AF.add(Camera.Parameters.FOCUS_MODE_AUTO);
- FOCUS_MODES_CALLING_AF.add(Camera.Parameters.FOCUS_MODE_MACRO);
- }
-
- private boolean stopped;
- private boolean focusing;
- private final boolean useAutoFocus;
- private final Camera camera;
- private AsyncTask outstandingTask;
-
- public AutoFocusManager(Context context, Camera camera) {
- this.camera = camera;
- String currentFocusMode = camera.getParameters().getFocusMode();
- useAutoFocus = FOCUS_MODES_CALLING_AF.contains(currentFocusMode);
- Log.i(TAG, "Current focus mode '" + currentFocusMode + "'; use auto focus? " + useAutoFocus);
- start();
- }
-
- @Override
- public synchronized void onAutoFocus(boolean success, Camera theCamera) {
- focusing = false;
- autoFocusAgainLater();
- }
-
- @SuppressLint("NewApi")
- private synchronized void autoFocusAgainLater() {
- if (!stopped && outstandingTask == null) {
- AutoFocusTask newTask = new AutoFocusTask();
- try {
- if (Build.VERSION.SDK_INT >= 11) {
- newTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
- } else {
- newTask.execute();
- }
- outstandingTask = newTask;
- } catch (RejectedExecutionException ree) {
- Log.w(TAG, "Could not request auto focus", ree);
- }
- }
- }
-
- public synchronized void start() {
- if (useAutoFocus) {
- outstandingTask = null;
- if (!stopped && !focusing) {
- try {
- camera.autoFocus(this);
- focusing = true;
- } catch (RuntimeException re) {
- // Have heard RuntimeException reported in Android 4.0.x+;
- // continue?
- Log.w(TAG, "Unexpected exception while focusing", re);
- // Try again later to keep cycle going
- autoFocusAgainLater();
- }
- }
- }
- }
-
- private synchronized void cancelOutstandingTask() {
- if (outstandingTask != null) {
- if (outstandingTask.getStatus() != AsyncTask.Status.FINISHED) {
- outstandingTask.cancel(true);
- }
- outstandingTask = null;
- }
- }
-
- public synchronized void stop() {
- stopped = true;
- if (useAutoFocus) {
- cancelOutstandingTask();
- // Doesn't hurt to call this even if not focusing
- try {
- camera.cancelAutoFocus();
- } catch (RuntimeException re) {
- // Have heard RuntimeException reported in Android 4.0.x+;
- // continue?
- Log.w(TAG, "Unexpected exception while cancelling focusing", re);
- }
- }
- }
-
- private final class AutoFocusTask extends AsyncTask {
- @Override
- protected Object doInBackground(Object... voids) {
- try {
- Thread.sleep(AUTO_FOCUS_INTERVAL_MS);
- } catch (InterruptedException e) {
- // continue
- }
- start();
- return null;
- }
- }
-
-}
diff --git a/src/main/java/zxing/camera/CameraConfigurationManager.java b/src/main/java/zxing/camera/CameraConfigurationManager.java
deleted file mode 100644
index 53a8c50..0000000
--- a/src/main/java/zxing/camera/CameraConfigurationManager.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Copyright (C) 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package zxing.camera;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.graphics.Point;
-import android.hardware.Camera;
-import android.util.Log;
-import android.view.Display;
-import android.view.WindowManager;
-
-public final class CameraConfigurationManager {
-
- private static final String TAG = "CameraConfiguration";
-
- private static final int MIN_PREVIEW_PIXELS = 480 * 320;
- private static final double MAX_ASPECT_DISTORTION = 0.15;
-
- private final Context context;
-
- // 屏幕分辨率
- private Point screenResolution;
- // 相机分辨率
- private Point cameraResolution;
-
- public CameraConfigurationManager(Context context) {
- this.context = context;
- }
-
- public void initFromCameraParameters(Camera camera) {
- Camera.Parameters parameters = camera.getParameters();
- WindowManager manager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
- Display display = manager.getDefaultDisplay();
- Point theScreenResolution = new Point();
- theScreenResolution = getDisplaySize(display);
-
- screenResolution = theScreenResolution;
- Log.i(TAG, "Screen resolution: " + screenResolution);
-
- /** 因为换成了竖屏显示，所以不替换屏幕宽高得出的预览图是变形的 */
- Point screenResolutionForCamera = new Point();
- screenResolutionForCamera.x = screenResolution.x;
- screenResolutionForCamera.y = screenResolution.y;
-
- if (screenResolution.x < screenResolution.y) {
- screenResolutionForCamera.x = screenResolution.y;
- screenResolutionForCamera.y = screenResolution.x;
- }
-
- cameraResolution = findBestPreviewSizeValue(parameters, screenResolutionForCamera);
- Log.i(TAG, "Camera resolution x: " + cameraResolution.x);
- Log.i(TAG, "Camera resolution y: " + cameraResolution.y);
- }
-
- @SuppressLint("NewApi")
- private Point getDisplaySize(final Display display) {
- final Point point = new Point();
- try {
- display.getSize(point);
- } catch (NoSuchMethodError ignore) {
- point.x = display.getWidth();
- point.y = display.getHeight();
- }
- return point;
- }
-
- public void setDesiredCameraParameters(Camera camera, boolean safeMode) {
- Camera.Parameters parameters = camera.getParameters();
-
- if (parameters == null) {
- Log.w(TAG, "Device error: no camera parameters are available. Proceeding without configuration.");
- return;
- }
-
- Log.i(TAG, "Initial camera parameters: " + parameters.flatten());
-
- if (safeMode) {
- Log.w(TAG, "In camera config safe mode -- most settings will not be honored");
- }
-
- parameters.setPreviewSize(cameraResolution.x, cameraResolution.y);
- camera.setParameters(parameters);
-
- Camera.Parameters afterParameters = camera.getParameters();
- Camera.Size afterSize = afterParameters.getPreviewSize();
- if (afterSize != null && (cameraResolution.x != afterSize.width || cameraResolution.y != afterSize.height)) {
- Log.w(TAG, "Camera said it supported preview size " + cameraResolution.x + 'x' + cameraResolution.y + ", but after setting it, preview size is " + afterSize.width + 'x' + afterSize.height);
- cameraResolution.x = afterSize.width;
- cameraResolution.y = afterSize.height;
- }
-
- /** 设置相机预览为竖屏 */
- String model=android.os.Build.MODEL;
- if("Nexus 5X".equals(model)){
- camera.setDisplayOrientation(270);
- }else{
- camera.setDisplayOrientation(90);
- }
-
- }
-
- public Point getCameraResolution() {
- return cameraResolution;
- }
-
- public Point getScreenResolution() {
- return screenResolution;
- }
-
- /**
- * 从相机支持的分辨率中计算出最适合的预览界面尺寸
- *
- * @param parameters
- * @param screenResolution
- * @return
- */
- private Point findBestPreviewSizeValue(Camera.Parameters parameters, Point screenResolution) {
- List rawSupportedSizes = parameters.getSupportedPreviewSizes();
- if (rawSupportedSizes == null) {
- Log.w(TAG, "Device returned no supported preview sizes; using default");
- Camera.Size defaultSize = parameters.getPreviewSize();
- return new Point(defaultSize.width, defaultSize.height);
- }
-
- // Sort by size, descending
- List supportedPreviewSizes = new ArrayList(rawSupportedSizes);
- Collections.sort(supportedPreviewSizes, new Comparator() {
- @Override
- public int compare(Camera.Size a, Camera.Size b) {
- int aPixels = a.height * a.width;
- int bPixels = b.height * b.width;
- if (bPixels < aPixels) {
- return -1;
- }
- if (bPixels > aPixels) {
- return 1;
- }
- return 0;
- }
- });
-
- if (Log.isLoggable(TAG, Log.INFO)) {
- StringBuilder previewSizesString = new StringBuilder();
- for (Camera.Size supportedPreviewSize : supportedPreviewSizes) {
- previewSizesString.append(supportedPreviewSize.width).append('x').append(supportedPreviewSize.height).append(' ');
- }
- Log.i(TAG, "Supported preview sizes: " + previewSizesString);
- }
-
- double screenAspectRatio = (double) screenResolution.x / (double) screenResolution.y;
-
- // Remove sizes that are unsuitable
- Iterator it = supportedPreviewSizes.iterator();
- while (it.hasNext()) {
- Camera.Size supportedPreviewSize = it.next();
- int realWidth = supportedPreviewSize.width;
- int realHeight = supportedPreviewSize.height;
- if (realWidth * realHeight < MIN_PREVIEW_PIXELS) {
- it.remove();
- continue;
- }
-
- boolean isCandidatePortrait = realWidth < realHeight;
- int maybeFlippedWidth = isCandidatePortrait ? realHeight : realWidth;
- int maybeFlippedHeight = isCandidatePortrait ? realWidth : realHeight;
-
- double aspectRatio = (double) maybeFlippedWidth / (double) maybeFlippedHeight;
- double distortion = Math.abs(aspectRatio - screenAspectRatio);
- if (distortion > MAX_ASPECT_DISTORTION) {
- it.remove();
- continue;
- }
-
- if (maybeFlippedWidth == screenResolution.x && maybeFlippedHeight == screenResolution.y) {
- Point exactPoint = new Point(realWidth, realHeight);
- Log.i(TAG, "Found preview size exactly matching screen size: " + exactPoint);
- return exactPoint;
- }
- }
-
- // If no exact match, use largest preview size. This was not a great
- // idea on older devices because
- // of the additional computation needed. We're likely to get here on
- // newer Android 4+ devices, where
- // the CPU is much more powerful.
- if (!supportedPreviewSizes.isEmpty()) {
- Camera.Size largestPreview = supportedPreviewSizes.get(0);
- Point largestSize = new Point(largestPreview.width, largestPreview.height);
- Log.i(TAG, "Using largest suitable preview size: " + largestSize);
- return largestSize;
- }
-
- // If there is nothing at all suitable, return current preview size
- Camera.Size defaultPreview = parameters.getPreviewSize();
- Point defaultSize = new Point(defaultPreview.width, defaultPreview.height);
- Log.i(TAG, "No suitable preview sizes, using default: " + defaultSize);
-
- return defaultSize;
- }
-}
diff --git a/src/main/java/zxing/camera/CameraManager.java b/src/main/java/zxing/camera/CameraManager.java
deleted file mode 100644
index 9286c5b..0000000
--- a/src/main/java/zxing/camera/CameraManager.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright (C) 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package zxing.camera;
-
-import java.io.IOException;
-
-import zxing.camera.open.OpenCameraInterface;
-import android.content.Context;
-import android.graphics.Point;
-import android.hardware.Camera;
-import android.hardware.Camera.Size;
-import android.os.Handler;
-import android.util.Log;
-import android.view.SurfaceHolder;
-
-
-/**
- * This object wraps the Camera service object and expects to be the only one
- * talking to it. The implementation encapsulates the steps needed to take
- * preview-sized images, which are used for both preview and decoding.
- *
- * @author dswitkin@google.com (Daniel Switkin)
- */
-public class CameraManager {
-
- private static final String TAG = CameraManager.class.getSimpleName();
-
- private final Context context;
- private final CameraConfigurationManager configManager;
- private Camera camera;
- private AutoFocusManager autoFocusManager;
-
- private boolean initialized;
- private boolean previewing;
- private int requestedCameraId = -1;
- /**
- * Preview frames are delivered here, which we pass on to the registered
- * handler. Make sure to clear the handler so it will only receive one
- * message.
- */
- private final PreviewCallback previewCallback;
-
- public CameraManager(Context context) {
- this.context = context;
- this.configManager = new CameraConfigurationManager(context);
- previewCallback = new PreviewCallback(configManager);
- }
-
- /**
- * Opens the camera driver and initializes the hardware parameters.
- *
- * @param holder
- * The surface object which the camera will draw preview frames
- * into.
- * @throws IOException
- * Indicates the camera driver failed to open.
- */
- public synchronized void openDriver(SurfaceHolder holder) throws IOException {
- Camera theCamera = camera;
- if (theCamera == null) {
-
- if (requestedCameraId >= 0) {
- theCamera = OpenCameraInterface.open(requestedCameraId);
- } else {
- theCamera = OpenCameraInterface.open();
- }
-
- if (theCamera == null) {
- throw new IOException();
- }
- camera = theCamera;
- }
- theCamera.setPreviewDisplay(holder);
-
- if (!initialized) {
- initialized = true;
- configManager.initFromCameraParameters(theCamera);
- }
-
- Camera.Parameters parameters = theCamera.getParameters();
- String parametersFlattened = parameters == null ? null : parameters.flatten(); // Save
- // these,
- // temporarily
- try {
- configManager.setDesiredCameraParameters(theCamera, false);
- } catch (RuntimeException re) {
- // Driver failed
- Log.w(TAG, "Camera rejected parameters. Setting only minimal safe-mode parameters");
- Log.i(TAG, "Resetting to saved camera params: " + parametersFlattened);
- // Reset:
- if (parametersFlattened != null) {
- parameters = theCamera.getParameters();
- parameters.unflatten(parametersFlattened);
- try {
- theCamera.setParameters(parameters);
- configManager.setDesiredCameraParameters(theCamera, true);
- } catch (RuntimeException re2) {
- // Well, darn. Give up
- Log.w(TAG, "Camera rejected even safe-mode parameters! No configuration");
- }
- }
- }
-
- }
-
- public synchronized boolean isOpen() {
- return camera != null;
- }
-
- /**
- * Closes the camera driver if still in use.
- */
- public synchronized void closeDriver() {
- if (camera != null) {
- camera.release();
- camera = null;
- // Make sure to clear these each time we close the camera, so that
- // any scanning rect
- // requested by intent is forgotten.
- }
- }
-
- /**
- * Asks the camera hardware to begin drawing preview frames to the screen.
- */
- public synchronized void startPreview() {
- Camera theCamera = camera;
- if (theCamera != null && !previewing) {
- theCamera.startPreview();
- previewing = true;
- autoFocusManager = new AutoFocusManager(context, camera);
- }
- }
-
- /**
- * Tells the camera to stop drawing preview frames.
- */
- public synchronized void stopPreview() {
- if (autoFocusManager != null) {
- autoFocusManager.stop();
- autoFocusManager = null;
- }
- if (camera != null && previewing) {
- camera.stopPreview();
- previewCallback.setHandler(null, 0);
- previewing = false;
- }
- }
-
- /**
- * A single preview frame will be returned to the handler supplied. The data
- * will arrive as byte[] in the message.obj field, with width and height
- * encoded as message.arg1 and message.arg2, respectively.
- *
- * @param handler
- * The handler to send the message to.
- * @param message
- * The what field of the message to be sent.
- */
- public synchronized void requestPreviewFrame(Handler handler, int message) {
- Camera theCamera = camera;
- if (theCamera != null && previewing) {
- previewCallback.setHandler(handler, message);
- theCamera.setOneShotPreviewCallback(previewCallback);
- }
- }
-
- /**
- * Allows third party apps to specify the camera ID, rather than determine
- * it automatically based on available cameras and their orientation.
- *
- * @param cameraId
- * camera ID of the camera to use. A negative value means
- * "no preference".
- */
- public synchronized void setManualCameraId(int cameraId) {
- requestedCameraId = cameraId;
- }
-
- /**
- * 获取相机分辨率
- *
- * @return
- */
- public Point getCameraResolution() {
- return configManager.getCameraResolution();
- }
-
- public Size getPreviewSize() {
- if (null != camera) {
- return camera.getParameters().getPreviewSize();
- }
- return null;
- }
-}
diff --git a/src/main/java/zxing/camera/PreviewCallback.java b/src/main/java/zxing/camera/PreviewCallback.java
deleted file mode 100644
index 7333d87..0000000
--- a/src/main/java/zxing/camera/PreviewCallback.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2010 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package zxing.camera;
-
-import android.graphics.Point;
-import android.hardware.Camera;
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-
-public class PreviewCallback implements Camera.PreviewCallback {
-
- private static final String TAG = PreviewCallback.class.getSimpleName();
-
- private final CameraConfigurationManager configManager;
- private Handler previewHandler;
- private int previewMessage;
-
- public PreviewCallback(CameraConfigurationManager configManager) {
- this.configManager = configManager;
- }
-
- public void setHandler(Handler previewHandler, int previewMessage) {
- this.previewHandler = previewHandler;
- this.previewMessage = previewMessage;
- }
-
- @Override
- public void onPreviewFrame(byte[] data, Camera camera) {
- Point cameraResolution = configManager.getCameraResolution();
- Handler thePreviewHandler = previewHandler;
- if (cameraResolution != null && thePreviewHandler != null) {
- Message message = thePreviewHandler.obtainMessage(previewMessage, cameraResolution.x, cameraResolution.y,
- data);
- message.sendToTarget();
- previewHandler = null;
- } else {
- Log.d(TAG, "Got preview callback, but no handler or resolution available");
- }
- }
-
-}
diff --git a/src/main/java/zxing/camera/open/OpenCameraInterface.java b/src/main/java/zxing/camera/open/OpenCameraInterface.java
deleted file mode 100644
index 553964e..0000000
--- a/src/main/java/zxing/camera/open/OpenCameraInterface.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2012 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package zxing.camera.open;
-
-import android.hardware.Camera;
-import android.util.Log;
-
-public class OpenCameraInterface {
-
- private static final String TAG = OpenCameraInterface.class.getName();
-
- /**
- * Opens the requested camera with {@link Camera#open(int)}, if one exists.
- *
- * @param cameraId
- * camera ID of the camera to use. A negative value means
- * "no preference"
- * @return handle to {@link Camera} that was opened
- */
- public static Camera open(int cameraId) {
-
- int numCameras = Camera.getNumberOfCameras();
- if (numCameras == 0) {
- Log.w(TAG, "No cameras!");
- return null;
- }
-
- boolean explicitRequest = cameraId >= 0;
-
- if (!explicitRequest) {
- // Select a camera if no explicit camera requested
- int index = 0;
- while (index < numCameras) {
- Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
- Camera.getCameraInfo(index, cameraInfo);
- if (cameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_BACK) {
- break;
- }
- index++;
- }
-
- cameraId = index;
- }
-
- Camera camera;
- if (cameraId < numCameras) {
- Log.i(TAG, "Opening camera #" + cameraId);
- camera = Camera.open(cameraId);
- } else {
- if (explicitRequest) {
- Log.w(TAG, "Requested camera does not exist: " + cameraId);
- camera = null;
- } else {
- Log.i(TAG, "No camera facing back; returning camera #0");
- camera = Camera.open(0);
- }
- }
-
- return camera;
- }
-
- /**
- * Opens a rear-facing camera with {@link Camera#open(int)}, if one exists,
- * or opens camera 0.
- *
- * @return handle to {@link Camera} that was opened
- */
- public static Camera open() {
- return open(-1);
- }
-
-}
diff --git a/src/main/java/zxing/decoding/DecodeFormatManager.java b/src/main/java/zxing/decoding/DecodeFormatManager.java
deleted file mode 100644
index 3ddebe9..0000000
--- a/src/main/java/zxing/decoding/DecodeFormatManager.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2010 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package zxing.decoding;
-
-import java.util.Collection;
-import java.util.EnumSet;
-import java.util.Set;
-
-import com.google.zxing.BarcodeFormat;
-
-public class DecodeFormatManager {
-
- // 1D解码
- private static final Set PRODUCT_FORMATS;
- private static final Set INDUSTRIAL_FORMATS;
- private static final Set ONE_D_FORMATS;
-
- // 二维码解码
- private static final Set QR_CODE_FORMATS;
-
- static {
- PRODUCT_FORMATS = EnumSet.of(BarcodeFormat.UPC_A, BarcodeFormat.UPC_E, BarcodeFormat.EAN_13, BarcodeFormat.EAN_8, BarcodeFormat.RSS_14, BarcodeFormat.RSS_EXPANDED);
- INDUSTRIAL_FORMATS = EnumSet.of(BarcodeFormat.CODE_39, BarcodeFormat.CODE_93, BarcodeFormat.CODE_128, BarcodeFormat.ITF, BarcodeFormat.CODABAR);
- ONE_D_FORMATS = EnumSet.copyOf(PRODUCT_FORMATS);
- ONE_D_FORMATS.addAll(INDUSTRIAL_FORMATS);
-
- QR_CODE_FORMATS = EnumSet.of(BarcodeFormat.QR_CODE);
- }
-
- public static Collection getQrCodeFormats() {
- return QR_CODE_FORMATS;
- }
-
- public static Collection getBarCodeFormats() {
- return ONE_D_FORMATS;
- }
-}
diff --git a/src/main/java/zxing/decoding/DecodeHandler.java b/src/main/java/zxing/decoding/DecodeHandler.java
deleted file mode 100644
index c95ea87..0000000
--- a/src/main/java/zxing/decoding/DecodeHandler.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (C) 2010 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package zxing.decoding;
-
-import android.graphics.Bitmap;
-import android.graphics.Rect;
-import android.hardware.Camera.Size;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Message;
-
-import com.gizwits.opensource.appkit.R;
-import com.google.zxing.BinaryBitmap;
-import com.google.zxing.DecodeHintType;
-import com.google.zxing.MultiFormatReader;
-import com.google.zxing.PlanarYUVLuminanceSource;
-import com.google.zxing.ReaderException;
-import com.google.zxing.Result;
-import com.google.zxing.common.HybridBinarizer;
-
-import java.io.ByteArrayOutputStream;
-import java.util.Map;
-
-import zxing.CaptureActivity;
-
-
-public class DecodeHandler extends Handler {
-
- private final CaptureActivity activity;
- private final MultiFormatReader multiFormatReader;
- private boolean running = true;
-
- public DecodeHandler(CaptureActivity activity, Map hints) {
- multiFormatReader = new MultiFormatReader();
- multiFormatReader.setHints(hints);
- this.activity = activity;
- }
-
- @Override
- public void handleMessage(Message message) {
- if (!running) {
- return;
- }
- switch (message.what) {
- case R.id.decode:
- decode((byte[]) message.obj, message.arg1, message.arg2);
- break;
- case R.id.quit:
- running = false;
- Looper.myLooper().quit();
- break;
- }
- }
-
- /**
- * Decode the data within the viewfinder rectangle, and time how long it
- * took. For efficiency, reuse the same reader objects from one decode to
- * the next.
- *
- * @param data
- * The YUV preview frame.
- * @param width
- * The width of the preview frame.
- * @param height
- * The height of the preview frame.
- */
- private void decode(byte[] data, int width, int height) {
- Size size = activity.getCameraManager().getPreviewSize();
-
- // 这里需要将获取的data翻转一下，因为相机默认拿的的横屏的数据
- byte[] rotatedData = new byte[data.length];
- for (int y = 0; y < size.height; y++) {
- for (int x = 0; x < size.width; x++)
- rotatedData[x * size.height + size.height - y - 1] = data[x + y * size.width];
- }
-
- // 宽高也要调整
- int tmp = size.width;
- size.width = size.height;
- size.height = tmp;
-
- Result rawResult = null;
- PlanarYUVLuminanceSource source = buildLuminanceSource(rotatedData, size.width, size.height);
- if (source != null) {
- BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
- try {
- rawResult = multiFormatReader.decodeWithState(bitmap);
- } catch (ReaderException re) {
- // continue
- } finally {
- multiFormatReader.reset();
- }
- }
-
- Handler handler = activity.getHandler();
- if (rawResult != null) {
- // Don't log the barcode contents for security.
- if (handler != null) {
- Message message = Message.obtain(handler, R.id.decode_succeeded, rawResult);
- Bundle bundle = new Bundle();
- bundleThumbnail(source, bundle);
- message.setData(bundle);
- message.sendToTarget();
- }
- } else {
- if (handler != null) {
- Message message = Message.obtain(handler, R.id.decode_failed);
- message.sendToTarget();
- }
- }
-
- }
-
- private static void bundleThumbnail(PlanarYUVLuminanceSource source, Bundle bundle) {
- int[] pixels = source.renderThumbnail();
- int width = source.getThumbnailWidth();
- int height = source.getThumbnailHeight();
- Bitmap bitmap = Bitmap.createBitmap(pixels, 0, width, width, height, Bitmap.Config.ARGB_8888);
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- bitmap.compress(Bitmap.CompressFormat.JPEG, 50, out);
- bundle.putByteArray(DecodeThread.BARCODE_BITMAP, out.toByteArray());
- }
-
- /**
- * A factory method to build the appropriate LuminanceSource object based on
- * the format of the preview buffers, as described by Camera.Parameters.
- *
- * @param data
- * A preview frame.
- * @param width
- * The width of the image.
- * @param height
- * The height of the image.
- * @return A PlanarYUVLuminanceSource instance.
- */
- public PlanarYUVLuminanceSource buildLuminanceSource(byte[] data, int width, int height) {
- Rect rect = activity.getCropRect();
- if (rect == null) {
- return null;
- }
- // Go ahead and assume it's YUV rather than die.
- return new PlanarYUVLuminanceSource(data, width, height, rect.left, rect.top, rect.width(), rect.height(),
- false);
- }
-
-}
diff --git a/src/main/java/zxing/decoding/DecodeThread.java b/src/main/java/zxing/decoding/DecodeThread.java
deleted file mode 100644
index 140ef38..0000000
--- a/src/main/java/zxing/decoding/DecodeThread.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package zxing.decoding;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import zxing.CaptureActivity;
-import android.os.Handler;
-import android.os.Looper;
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.DecodeHintType;
-
-/**
- * This thread does all the heavy lifting of decoding the images.
- *
- * @author dswitkin@google.com (Daniel Switkin)
- */
-public class DecodeThread extends Thread {
-
- public static final String BARCODE_BITMAP = "barcode_bitmap";
-
- public static final int BARCODE_MODE = 0X100;
- public static final int QRCODE_MODE = 0X200;
- public static final int ALL_MODE = 0X300;
-
- private final CaptureActivity activity;
- private final Map hints;
- private Handler handler;
- private final CountDownLatch handlerInitLatch;
-
- public DecodeThread(CaptureActivity activity, int decodeMode) {
-
- this.activity = activity;
- handlerInitLatch = new CountDownLatch(1);
-
- hints = new EnumMap(DecodeHintType.class);
-
- Collection decodeFormats = new ArrayList();
- decodeFormats.addAll(EnumSet.of(BarcodeFormat.AZTEC));
- decodeFormats.addAll(EnumSet.of(BarcodeFormat.PDF_417));
-
- switch (decodeMode) {
- case BARCODE_MODE:
- decodeFormats.addAll(DecodeFormatManager.getBarCodeFormats());
- break;
-
- case QRCODE_MODE:
- decodeFormats.addAll(DecodeFormatManager.getQrCodeFormats());
- break;
-
- case ALL_MODE:
- decodeFormats.addAll(DecodeFormatManager.getBarCodeFormats());
- decodeFormats.addAll(DecodeFormatManager.getQrCodeFormats());
- break;
-
- default:
- break;
- }
-
- hints.put(DecodeHintType.POSSIBLE_FORMATS, decodeFormats);
- }
-
- public Handler getHandler() {
- try {
- handlerInitLatch.await();
- } catch (InterruptedException ie) {
- // continue?
- }
- return handler;
- }
-
- @Override
- public void run() {
- Looper.prepare();
- handler = new DecodeHandler(activity, hints);
- handlerInitLatch.countDown();
- Looper.loop();
- }
-
-}
diff --git a/src/main/java/zxing/utils/CaptureActivityHandler.java b/src/main/java/zxing/utils/CaptureActivityHandler.java
deleted file mode 100644
index fc9d696..0000000
--- a/src/main/java/zxing/utils/CaptureActivityHandler.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package zxing.utils;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-
-import com.gizwits.opensource.appkit.R;
-import com.google.zxing.Result;
-
-import zxing.CaptureActivity;
-import zxing.camera.CameraManager;
-import zxing.decoding.DecodeThread;
-
-
-/**
- * This class handles all the messaging which comprises the state machine for
- * capture.
- *
- * @author dswitkin@google.com (Daniel Switkin)
- */
-public class CaptureActivityHandler extends Handler {
-
- private final CaptureActivity activity;
- private final DecodeThread decodeThread;
- private final CameraManager cameraManager;
- private State state;
-
- private enum State {
- PREVIEW, SUCCESS, DONE
- }
-
- public CaptureActivityHandler(CaptureActivity activity, CameraManager cameraManager, int decodeMode) {
- this.activity = activity;
- decodeThread = new DecodeThread(activity, decodeMode);
- decodeThread.start();
- state = State.SUCCESS;
-
- // Start ourselves capturing previews and decoding.
- this.cameraManager = cameraManager;
- cameraManager.startPreview();
- restartPreviewAndDecode();
- }
-
- @Override
- public void handleMessage(Message message) {
- switch (message.what) {
- case R.id.restart_preview:
- restartPreviewAndDecode();
- break;
- case R.id.decode_succeeded:
- state = State.SUCCESS;
- Bundle bundle = message.getData();
-
- activity.handleDecode((Result) message.obj, bundle);
- break;
- case R.id.decode_failed:
- // We're decoding as fast as possible, so when one decode fails,
- // start another.
- state = State.PREVIEW;
- cameraManager.requestPreviewFrame(decodeThread.getHandler(), R.id.decode);
- break;
- case R.id.return_scan_result:
- activity.setResult(Activity.RESULT_OK, (Intent) message.obj);
- activity.finish();
- break;
- }
- }
-
- public void quitSynchronously() {
- state = State.DONE;
- cameraManager.stopPreview();
- Message quit = Message.obtain(decodeThread.getHandler(), R.id.quit);
- quit.sendToTarget();
- try {
- // Wait at most half a second; should be enough time, and onPause()
- // will timeout quickly
- decodeThread.join(500L);
- } catch (InterruptedException e) {
- // continue
- }
-
- // Be absolutely sure we don't send any queued up messages
- removeMessages(R.id.decode_succeeded);
- removeMessages(R.id.decode_failed);
- }
-
- private void restartPreviewAndDecode() {
- if (state == State.SUCCESS) {
- state = State.PREVIEW;
- cameraManager.requestPreviewFrame(decodeThread.getHandler(), R.id.decode);
- }
- }
-
-}
diff --git a/src/main/java/zxing/utils/InactivityTimer.java b/src/main/java/zxing/utils/InactivityTimer.java
deleted file mode 100644
index c26733a..0000000
--- a/src/main/java/zxing/utils/InactivityTimer.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2010 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package zxing.utils;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.AsyncTask;
-import android.os.BatteryManager;
-import android.os.Build;
-import android.util.Log;
-
-/**
- * Finishes an activity after a period of inactivity if the device is on battery
- * power.
- */
-public class InactivityTimer {
-
- private static final String TAG = InactivityTimer.class.getSimpleName();
-
- private static final long INACTIVITY_DELAY_MS = 5 * 60 * 1000L;
-
- private Activity activity;
- private BroadcastReceiver powerStatusReceiver;
- private boolean registered;
- private AsyncTask inactivityTask;
-
- public InactivityTimer(Activity activity) {
- this.activity = activity;
- powerStatusReceiver = new PowerStatusReceiver();
- registered = false;
- onActivity();
- }
-
- @SuppressLint("NewApi")
- public synchronized void onActivity() {
- cancel();
- inactivityTask = new InactivityAsyncTask();
- if (Build.VERSION.SDK_INT >= 11) {
- inactivityTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
- } else {
- inactivityTask.execute();
- }
- }
-
- public synchronized void onPause() {
- cancel();
- if (registered) {
- activity.unregisterReceiver(powerStatusReceiver);
- registered = false;
- } else {
- Log.w(TAG, "PowerStatusReceiver was never registered?");
- }
- }
-
- public synchronized void onResume() {
- if (registered) {
- Log.w(TAG, "PowerStatusReceiver was already registered?");
- } else {
- activity.registerReceiver(powerStatusReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
- registered = true;
- }
- onActivity();
- }
-
- private synchronized void cancel() {
- AsyncTask task = inactivityTask;
- if (task != null) {
- task.cancel(true);
- inactivityTask = null;
- }
- }
-
- public void shutdown() {
- cancel();
- }
-
- private class PowerStatusReceiver extends BroadcastReceiver {
- @Override
- public void onReceive(Context context, Intent intent) {
- if (Intent.ACTION_BATTERY_CHANGED.equals(intent.getAction())) {
- // 0 indicates that we're on battery
- boolean onBatteryNow = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) <= 0;
- if (onBatteryNow) {
- InactivityTimer.this.onActivity();
- } else {
- InactivityTimer.this.cancel();
- }
- }
- }
- }
-
- private class InactivityAsyncTask extends AsyncTask {
- @Override
- protected Object doInBackground(Object... objects) {
- try {
- Thread.sleep(INACTIVITY_DELAY_MS);
- Log.i(TAG, "Finishing activity due to inactivity");
- activity.finish();
- } catch (InterruptedException e) {
- // continue without killing
- }
- return null;
- }
- }
-
-}
diff --git a/src/main/res/.DS_Store b/src/main/res/.DS_Store
deleted file mode 100644
index cfe1ba1..0000000
Binary files a/src/main/res/.DS_Store and /dev/null differ
diff --git a/src/main/res/anim/in_from_left.xml b/src/main/res/anim/in_from_left.xml
deleted file mode 100644
index 396cd1a..0000000
--- a/src/main/res/anim/in_from_left.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/res/anim/in_from_right.xml b/src/main/res/anim/in_from_right.xml
deleted file mode 100644
index fe65b4e..0000000
--- a/src/main/res/anim/in_from_right.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/res/anim/out_to_left.xml b/src/main/res/anim/out_to_left.xml
deleted file mode 100644
index 79ea6ef..0000000
--- a/src/main/res/anim/out_to_left.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/res/anim/out_to_right.xml b/src/main/res/anim/out_to_right.xml
deleted file mode 100644
index d4504cf..0000000
--- a/src/main/res/anim/out_to_right.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/src/main/res/drawable-hdpi/launch.png b/src/main/res/drawable-hdpi/launch.png
deleted file mode 100644
index 9f9f7c3..0000000
Binary files a/src/main/res/drawable-hdpi/launch.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/.DS_Store b/src/main/res/drawable-xhdpi/.DS_Store
deleted file mode 100644
index a49a8d7..0000000
Binary files a/src/main/res/drawable-xhdpi/.DS_Store and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/about_logo.png b/src/main/res/drawable-xhdpi/about_logo.png
deleted file mode 100644
index 3cc3667..0000000
Binary files a/src/main/res/drawable-xhdpi/about_logo.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/button_blue_long.png b/src/main/res/drawable-xhdpi/button_blue_long.png
deleted file mode 100644
index 5eba212..0000000
Binary files a/src/main/res/drawable-xhdpi/button_blue_long.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/checkmark.png b/src/main/res/drawable-xhdpi/checkmark.png
deleted file mode 100644
index b147604..0000000
Binary files a/src/main/res/drawable-xhdpi/checkmark.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/common_add_button.png b/src/main/res/drawable-xhdpi/common_add_button.png
deleted file mode 100644
index 93988bb..0000000
Binary files a/src/main/res/drawable-xhdpi/common_add_button.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/common_arrow_right.png b/src/main/res/drawable-xhdpi/common_arrow_right.png
deleted file mode 100644
index 19d5b82..0000000
Binary files a/src/main/res/drawable-xhdpi/common_arrow_right.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/common_device_lan_offline.png b/src/main/res/drawable-xhdpi/common_device_lan_offline.png
deleted file mode 100644
index 60c0d0e..0000000
Binary files a/src/main/res/drawable-xhdpi/common_device_lan_offline.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/common_device_lan_online.png b/src/main/res/drawable-xhdpi/common_device_lan_online.png
deleted file mode 100644
index f1865b8..0000000
Binary files a/src/main/res/drawable-xhdpi/common_device_lan_online.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/common_device_remote_offline.png b/src/main/res/drawable-xhdpi/common_device_remote_offline.png
deleted file mode 100644
index 583c1de..0000000
Binary files a/src/main/res/drawable-xhdpi/common_device_remote_offline.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/common_device_remote_online.png b/src/main/res/drawable-xhdpi/common_device_remote_online.png
deleted file mode 100644
index 6d7110e..0000000
Binary files a/src/main/res/drawable-xhdpi/common_device_remote_online.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/common_password_hide.png b/src/main/res/drawable-xhdpi/common_password_hide.png
deleted file mode 100644
index 18eb3bc..0000000
Binary files a/src/main/res/drawable-xhdpi/common_password_hide.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/common_password_show.png b/src/main/res/drawable-xhdpi/common_password_show.png
deleted file mode 100644
index 553120d..0000000
Binary files a/src/main/res/drawable-xhdpi/common_password_show.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/config_help_button.png b/src/main/res/drawable-xhdpi/config_help_button.png
deleted file mode 100644
index 37d3840..0000000
Binary files a/src/main/res/drawable-xhdpi/config_help_button.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/device_none.png b/src/main/res/drawable-xhdpi/device_none.png
deleted file mode 100644
index 278221e..0000000
Binary files a/src/main/res/drawable-xhdpi/device_none.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/deviceonboarding_airlink_tips.png b/src/main/res/drawable-xhdpi/deviceonboarding_airlink_tips.png
deleted file mode 100644
index e58038b..0000000
Binary files a/src/main/res/drawable-xhdpi/deviceonboarding_airlink_tips.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/deviceonboarding_softap_tips.png b/src/main/res/drawable-xhdpi/deviceonboarding_softap_tips.png
deleted file mode 100644
index e58038b..0000000
Binary files a/src/main/res/drawable-xhdpi/deviceonboarding_softap_tips.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/devicesharing_user_icon.png b/src/main/res/drawable-xhdpi/devicesharing_user_icon.png
deleted file mode 100644
index 400a505..0000000
Binary files a/src/main/res/drawable-xhdpi/devicesharing_user_icon.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/feedbacksupport_selected.png b/src/main/res/drawable-xhdpi/feedbacksupport_selected.png
deleted file mode 100644
index dd7eb10..0000000
Binary files a/src/main/res/drawable-xhdpi/feedbacksupport_selected.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/feedbacksupport_unselected.png b/src/main/res/drawable-xhdpi/feedbacksupport_unselected.png
deleted file mode 100644
index 55b3d80..0000000
Binary files a/src/main/res/drawable-xhdpi/feedbacksupport_unselected.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/icon.png b/src/main/res/drawable-xhdpi/icon.png
deleted file mode 100644
index 3cc3667..0000000
Binary files a/src/main/res/drawable-xhdpi/icon.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/info_edit.png b/src/main/res/drawable-xhdpi/info_edit.png
deleted file mode 100644
index 9ad867b..0000000
Binary files a/src/main/res/drawable-xhdpi/info_edit.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/info_edit_cancel.png b/src/main/res/drawable-xhdpi/info_edit_cancel.png
deleted file mode 100644
index d5a1e90..0000000
Binary files a/src/main/res/drawable-xhdpi/info_edit_cancel.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/launch.png b/src/main/res/drawable-xhdpi/launch.png
deleted file mode 100644
index c3cb074..0000000
Binary files a/src/main/res/drawable-xhdpi/launch.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/launch_logo.png b/src/main/res/drawable-xhdpi/launch_logo.png
deleted file mode 100644
index 61f1c04..0000000
Binary files a/src/main/res/drawable-xhdpi/launch_logo.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/page_back_button.png b/src/main/res/drawable-xhdpi/page_back_button.png
deleted file mode 100644
index 3da2151..0000000
Binary files a/src/main/res/drawable-xhdpi/page_back_button.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/personal_sharing_icon.png b/src/main/res/drawable-xhdpi/personal_sharing_icon.png
deleted file mode 100644
index ce366f3..0000000
Binary files a/src/main/res/drawable-xhdpi/personal_sharing_icon.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/personalcenter_usermanger_icon.png b/src/main/res/drawable-xhdpi/personalcenter_usermanger_icon.png
deleted file mode 100644
index aff852a..0000000
Binary files a/src/main/res/drawable-xhdpi/personalcenter_usermanger_icon.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/qrcode_scan_frame.png b/src/main/res/drawable-xhdpi/qrcode_scan_frame.png
deleted file mode 100644
index de6cfbf..0000000
Binary files a/src/main/res/drawable-xhdpi/qrcode_scan_frame.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/qrcode_scan_line.png b/src/main/res/drawable-xhdpi/qrcode_scan_line.png
deleted file mode 100644
index 0749422..0000000
Binary files a/src/main/res/drawable-xhdpi/qrcode_scan_line.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/right_icon.png b/src/main/res/drawable-xhdpi/right_icon.png
deleted file mode 100644
index 0b73e0f..0000000
Binary files a/src/main/res/drawable-xhdpi/right_icon.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/thumb.png b/src/main/res/drawable-xhdpi/thumb.png
deleted file mode 100644
index 0db9afa..0000000
Binary files a/src/main/res/drawable-xhdpi/thumb.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/txt_delete_btn.png b/src/main/res/drawable-xhdpi/txt_delete_btn.png
deleted file mode 100644
index 7e4821d..0000000
Binary files a/src/main/res/drawable-xhdpi/txt_delete_btn.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/user_login_logo.png b/src/main/res/drawable-xhdpi/user_login_logo.png
deleted file mode 100644
index e49b86b..0000000
Binary files a/src/main/res/drawable-xhdpi/user_login_logo.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/user_login_qq.png b/src/main/res/drawable-xhdpi/user_login_qq.png
deleted file mode 100644
index 0b3b4d8..0000000
Binary files a/src/main/res/drawable-xhdpi/user_login_qq.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/user_login_wechat.png b/src/main/res/drawable-xhdpi/user_login_wechat.png
deleted file mode 100644
index f09cbf0..0000000
Binary files a/src/main/res/drawable-xhdpi/user_login_wechat.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/icon.png b/src/main/res/drawable-xxhdpi/icon.png
deleted file mode 100644
index 3cc3667..0000000
Binary files a/src/main/res/drawable-xxhdpi/icon.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/launch.png b/src/main/res/drawable-xxhdpi/launch.png
deleted file mode 100644
index 80e88e7..0000000
Binary files a/src/main/res/drawable-xxhdpi/launch.png and /dev/null differ
diff --git a/src/main/res/drawable/alert_bottom_left_shape.xml b/src/main/res/drawable/alert_bottom_left_shape.xml
deleted file mode 100644
index bbefd18..0000000
--- a/src/main/res/drawable/alert_bottom_left_shape.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/res/drawable/alert_bottom_left_shape_gray.xml b/src/main/res/drawable/alert_bottom_left_shape_gray.xml
deleted file mode 100644
index a23656b..0000000
--- a/src/main/res/drawable/alert_bottom_left_shape_gray.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/res/drawable/alert_bottom_right_shape.xml b/src/main/res/drawable/alert_bottom_right_shape.xml
deleted file mode 100644
index 423417b..0000000
--- a/src/main/res/drawable/alert_bottom_right_shape.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/res/drawable/alert_bottom_right_shape_gray.xml b/src/main/res/drawable/alert_bottom_right_shape_gray.xml
deleted file mode 100644
index ffa8ccc..0000000
--- a/src/main/res/drawable/alert_bottom_right_shape_gray.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/res/drawable/alert_bottom_shape.xml b/src/main/res/drawable/alert_bottom_shape.xml
deleted file mode 100644
index 23bf7da..0000000
--- a/src/main/res/drawable/alert_bottom_shape.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/res/drawable/alert_shape.xml b/src/main/res/drawable/alert_shape.xml
deleted file mode 100644
index 1835354..0000000
--- a/src/main/res/drawable/alert_shape.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/res/drawable/alert_top_shape.xml b/src/main/res/drawable/alert_top_shape.xml
deleted file mode 100644
index 8751978..0000000
--- a/src/main/res/drawable/alert_top_shape.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/res/drawable/alert_top_shape_gray.xml b/src/main/res/drawable/alert_top_shape_gray.xml
deleted file mode 100644
index 2ed4c02..0000000
--- a/src/main/res/drawable/alert_top_shape_gray.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/res/drawable/border_input_box.xml b/src/main/res/drawable/border_input_box.xml
deleted file mode 100644
index ce6f458..0000000
--- a/src/main/res/drawable/border_input_box.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/res/drawable/border_layer_list.xml b/src/main/res/drawable/border_layer_list.xml
deleted file mode 100644
index 75970f7..0000000
--- a/src/main/res/drawable/border_layer_list.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/res/drawable/btn_next_shape_gray.xml b/src/main/res/drawable/btn_next_shape_gray.xml
deleted file mode 100644
index 674f838..0000000
--- a/src/main/res/drawable/btn_next_shape_gray.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/main/res/drawable/checkbox_hook_selector.xml b/src/main/res/drawable/checkbox_hook_selector.xml
deleted file mode 100644
index 2f43081..0000000
--- a/src/main/res/drawable/checkbox_hook_selector.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
- -
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/res/drawable/img_bg_shape.xml b/src/main/res/drawable/img_bg_shape.xml
deleted file mode 100644
index 076dc54..0000000
--- a/src/main/res/drawable/img_bg_shape.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/main/res/drawable/img_bg_shape_white.xml b/src/main/res/drawable/img_bg_shape_white.xml
deleted file mode 100644
index 170a204..0000000
--- a/src/main/res/drawable/img_bg_shape_white.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/res/drawable/key_number_bg.xml b/src/main/res/drawable/key_number_bg.xml
deleted file mode 100644
index 9bb831b..0000000
--- a/src/main/res/drawable/key_number_bg.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-