();
if (TextUtils.isEmpty(mDevice.getAlias())) {
title = mDevice.getProductName();
@@ -402,140 +410,112 @@ public class GosDeviceControlActivity extends GosControlModuleBaseActivity imple
}
/**
- * 发送指令。格式为json。
- *
- * 例如 {"entity0":{"attr2":74},"cmd":1}
- * 其中entity0为gokit所代表的实体key，attr2代表led灯红色值，cmd为1时代表写入
- * 。以上命令代表改变gokit的led灯红色值为74.
+ * Description:
+ */
+ private void getStatusOfDevice() {
+ // 设备是否可控
+ if (isDeviceCanBeControlled()) {
+ // 可控则查询当前设备状态
+ mDevice.getDeviceStatus();
+ } else {
+ // 显示等待栏
+ progressDialog.show();
+ if (mDevice.isLAN()) {
+ // 小循环10s未连接上设备自动退出
+ handler.postDelayed(mRunnable, 10000);
+ } else {
+ // 大循环20s未连接上设备自动退出
+ handler.postDelayed(mRunnable, 20000);
+ }
+ }
+ }
+
+ private boolean isDeviceCanBeControlled() {
+ return mDevice.getNetStatus() == GizWifiDeviceNetStatus.GizDeviceControlled;
+ }
+
+ private void toastDeviceNoReadyAndExit() {
+ Toast.makeText(this, R.string.device_no_ready, Toast.LENGTH_SHORT).show();
+ finish();
+ }
+
+ private void toastDeviceDisconnectAndExit() {
+ Toast.makeText(GosDeviceControlActivity.this, R.string.disconnect, Toast.LENGTH_SHORT).show();
+ finish();
+ }
+
+ /**
+ * 发送指令
*
* @param key
- * 数据点对应的的json的key
+ * 数据点对应的标识名
* @param value
* 需要改变的值
- * @throws JSONException
- * the JSON exception
*/
- private void sendJson(String key, Object value) throws JSONException {
+ private void sendCommand(String key, Object value) {
+ int sn = 5;
ConcurrentHashMap hashMap = new ConcurrentHashMap();
hashMap.put(key, value);
- mDevice.write(hashMap, 0);
+ mDevice.write(hashMap, sn);
Log.i("Apptest", hashMap.toString());
}
- /** The handler. */
- Handler handler = new Handler() {
- public void handleMessage(Message msg) {
- super.handleMessage(msg);
-
- switch (msg.what) {
-
- case UPDATE_UI:
- isUpDateUi = true;
- tvColorText.setText(colorsList.get(Integer.parseInt(deviceStatu.get(KEY_LIGHT_COLOR).toString())));
- spf.edit().putInt("COLOR", Integer.parseInt(deviceStatu.get(KEY_LIGHT_COLOR).toString())).commit();
-
- swRed.setChecked((Boolean) deviceStatu.get(KEY_RED_SWITCH));
- swInfrared.setChecked((Boolean) deviceStatu.get(KEY_INFRARED));
- tvBlue.setText(deviceStatu.get(KEY_LIGHT_BLUE).toString());
- tvGreen.setText(deviceStatu.get(KEY_LIGHT_GREEN).toString());
- tvRed.setText(deviceStatu.get(KEY_LIGHT_RED).toString());
- tvSpeed.setText(deviceStatu.get(KEY_SPEED).toString());
- tvTemplate.setText(deviceStatu.get(KEY_TEMPLATE).toString());
- tvHumidity.setText(deviceStatu.get(KEY_HUMIDITY).toString());
- if (deviceStatu.get(KEY_LIGHT_BLUE).toString() != null) {
- sbBlue.setProgress(Integer.parseInt(deviceStatu.get(KEY_LIGHT_BLUE).toString()));
- } else {
- sbBlue.setProgress(0);
- }
-
- if (deviceStatu.get(KEY_LIGHT_GREEN).toString() != null) {
- sbGreen.setProgress(Integer.parseInt(deviceStatu.get(KEY_LIGHT_GREEN).toString()));
- } else {
- sbBlue.setProgress(0);
- }
+ private void updateUI() {
+ isSendCombinedColor = false;
+ tvColorText.setText(colorsList.get(Integer.parseInt(deviceStatu.get(KEY_LIGHT_COLOR).toString())));
+ spf.edit().putInt("COLOR", Integer.parseInt(deviceStatu.get(KEY_LIGHT_COLOR).toString())).commit();
+
+ swRed.setChecked((Boolean) deviceStatu.get(KEY_RED_SWITCH));
+ swInfrared.setChecked((Boolean) deviceStatu.get(KEY_INFRARED));
+ tvBlue.setText(deviceStatu.get(KEY_LIGHT_BLUE).toString());
+ tvGreen.setText(deviceStatu.get(KEY_LIGHT_GREEN).toString());
+ tvRed.setText(deviceStatu.get(KEY_LIGHT_RED).toString());
+ tvSpeed.setText(deviceStatu.get(KEY_SPEED).toString());
+ tvTemplate.setText(deviceStatu.get(KEY_TEMPLATE).toString());
+ tvHumidity.setText(deviceStatu.get(KEY_HUMIDITY).toString());
+ if (deviceStatu.get(KEY_LIGHT_BLUE).toString() != null) {
+ sbBlue.setProgress(Integer.parseInt(deviceStatu.get(KEY_LIGHT_BLUE).toString()));
+ } else {
+ sbBlue.setProgress(0);
+ }
- if (deviceStatu.get(KEY_LIGHT_RED).toString() != null) {
- sbRed.setProgress(Integer.parseInt(deviceStatu.get(KEY_LIGHT_RED).toString()));
- } else {
- sbBlue.setProgress(0);
- }
+ if (deviceStatu.get(KEY_LIGHT_GREEN).toString() != null) {
+ sbGreen.setProgress(Integer.parseInt(deviceStatu.get(KEY_LIGHT_GREEN).toString()));
+ } else {
+ sbBlue.setProgress(0);
+ }
- if (deviceStatu.get(KEY_SPEED).toString() != null) {
- sbSpeed.setProgress(5 + Integer.parseInt(deviceStatu.get(KEY_SPEED).toString()));
- } else {
- sbSpeed.setProgress(5);
- }
- break;
- case RESP:
- String data = msg.obj.toString();
+ if (deviceStatu.get(KEY_LIGHT_RED).toString() != null) {
+ sbRed.setProgress(Integer.parseInt(deviceStatu.get(KEY_LIGHT_RED).toString()));
+ } else {
+ sbBlue.setProgress(0);
+ }
- try {
- showDataInUI(data);
- } catch (JSONException e) {
- e.printStackTrace();
- }
+ if (deviceStatu.get(KEY_SPEED).toString() != null) {
+ sbSpeed.setProgress(5 + Integer.parseInt(deviceStatu.get(KEY_SPEED).toString()));
+ } else {
+ sbSpeed.setProgress(5);
+ }
+ }
- break;
- case LOG:
- StringBuilder sb = new StringBuilder();
- JSONObject jsonObject;
- int logText = 1;
- try {
- jsonObject = new JSONObject(msg.obj.toString());
- for (int i = 0; i < jsonObject.length(); i++) {
- if (jsonObject.getBoolean(jsonObject.names().getString(i)) != false) {
- sb.append(jsonObject.names().getString(i) + " " + logText + "\r\n");
- }
- }
- } catch (JSONException e) {
- e.printStackTrace();
- }
- if (sb.length() != 0) {
- Toast.makeText(GosDeviceControlActivity.this, sb.toString(), Toast.LENGTH_SHORT).show();
- }
- break;
- case TOAST:
- String info = msg.obj + "";
- Toast.makeText(GosDeviceControlActivity.this, info, Toast.LENGTH_SHORT).show();
- break;
- case HARDWARE:
- showHardwareInfo((String) msg.obj);
- break;
+ private void toastFaultsOrAlertsMessage(Message msg) {
+ StringBuilder sb = new StringBuilder();
+ ConcurrentHashMap map = (ConcurrentHashMap) msg.obj;
- case DISCONNECT:
- String disconnectText = (String) getText(R.string.disconnect);
- Toast.makeText(GosDeviceControlActivity.this, disconnectText, Toast.LENGTH_SHORT).show();
- mDevice.setSubscribe(false);
- mDevice.setListener(null);
- finish();
- break;
+ for (String key : map.keySet()) {
+ if ((Boolean) map.get(key)) {
+ sb.append(key + "1" + "\r\n");
}
-
}
- };
- /**
- * Show data in ui.
- *
- * @param data
- * the data
- * @throws JSONException
- * the JSON exception
- */
- @SuppressWarnings("rawtypes")
- private void showDataInUI(String data) throws JSONException {
- Log.i("revjson", data);
- JSONObject receive = new JSONObject(data);
- Iterator actions = receive.keys();
- while (actions.hasNext()) {
- String param = actions.next().toString();
- Object value = receive.get(param);
- deviceStatu.put(param, value);
+ if (sb.length() != 0) {
+ Toast.makeText(GosDeviceControlActivity.this, sb.toString(), Toast.LENGTH_SHORT).show();
}
- Message msg = new Message();
- msg.obj = data;
- msg.what = UPDATE_UI;
- handler.sendMessage(msg);
+ }
+
+ private void toastInfoMessage(Message msg) {
+ String info = msg.obj + "";
+ Toast.makeText(GosDeviceControlActivity.this, info, Toast.LENGTH_SHORT).show();
}
/**
@@ -549,8 +529,12 @@ public class GosDeviceControlActivity extends GosControlModuleBaseActivity imple
.setPositiveButton(R.string.besure, null).show();
}
+ /*
+ * 设备上报数据回调
+ */
protected void didReceiveData(GizWifiErrorCode result, GizWifiDevice device,
java.util.concurrent.ConcurrentHashMap dataMap, int sn) {
+
if (result != GizWifiErrorCode.GIZ_SDK_SUCCESS) {
Message msg = new Message();
msg.what = TOAST;
@@ -560,13 +544,15 @@ public class GosDeviceControlActivity extends GosControlModuleBaseActivity imple
if (dataMap.isEmpty()) {
return;
}
+
progressDialog.cancel();
if (dataMap.get("data") != null) {
Log.i("Apptest", dataMap.get("data").toString());
Message msg = new Message();
msg.obj = dataMap.get("data");
- msg.what = RESP;
+ deviceStatu = (ConcurrentHashMap) dataMap.get("data");
+ msg.what = UPDATE_UI;
handler.sendMessage(msg);
}
@@ -589,6 +575,9 @@ public class GosDeviceControlActivity extends GosControlModuleBaseActivity imple
}
}
+ /*
+ * 获取设备硬件信息回调
+ */
protected void didGetHardwareInfo(GizWifiErrorCode result, GizWifiDevice device,
java.util.concurrent.ConcurrentHashMap hardwareInfo) {
Log.i("Apptest", hardwareInfo.toString());
@@ -618,6 +607,9 @@ public class GosDeviceControlActivity extends GosControlModuleBaseActivity imple
handler.sendMessage(msg);
}
+ /*
+ * 设置设备信息回调
+ */
protected void didSetCustomInfo(GizWifiErrorCode result, GizWifiDevice device) {
progressDialog.cancel();
Message msg = new Message();
@@ -632,11 +624,18 @@ public class GosDeviceControlActivity extends GosControlModuleBaseActivity imple
handler.sendMessage(msg);
}
+ /*
+ * 设备状态改变回调，只有设备状态为可控才可以下发控制命令
+ */
protected void didUpdateNetStatus(GizWifiDevice device, GizWifiDeviceNetStatus netStatus) {
if (device == mDevice) {
if (GizWifiDeviceNetStatus.GizDeviceUnavailable == netStatus
|| GizWifiDeviceNetStatus.GizDeviceOffline == netStatus) {
handler.sendEmptyMessage(DISCONNECT);
+ } else {
+ handler.removeCallbacks(mRunnable);
+ progressDialog.cancel();
+ mDevice.getDeviceStatus();
}
}
}
@@ -648,88 +647,64 @@ public class GosDeviceControlActivity extends GosControlModuleBaseActivity imple
int redNum1 = sbRed.getProgress();
if (redNum1 < 254) {
redNum1++;
- try {
- sendJson(KEY_LIGHT_RED, redNum1);
- } catch (JSONException e) {
- e.printStackTrace();
- }
+ sendCommand(KEY_LIGHT_RED, redNum1);
+ sbRed.setProgress(redNum1);
}
break;
case R.id.redsub:
int redNum2 = sbRed.getProgress();
if (redNum2 > 0) {
redNum2--;
- try {
- sendJson(KEY_LIGHT_RED, redNum2);
- } catch (JSONException e) {
- e.printStackTrace();
- }
+ sendCommand(KEY_LIGHT_RED, redNum2);
+ sbRed.setProgress(redNum2);
}
break;
case R.id.greenadd:
int greenNum1 = sbGreen.getProgress();
if (greenNum1 < 254) {
greenNum1++;
- try {
- sendJson(KEY_LIGHT_GREEN, greenNum1);
- } catch (JSONException e) {
- e.printStackTrace();
- }
+ sendCommand(KEY_LIGHT_GREEN, greenNum1);
+ sbGreen.setProgress(greenNum1);
}
break;
case R.id.greensub:
int greenNum2 = sbGreen.getProgress();
if (greenNum2 > 0) {
greenNum2--;
- try {
- sendJson(KEY_LIGHT_GREEN, greenNum2);
- } catch (JSONException e) {
- e.printStackTrace();
- }
+ sendCommand(KEY_LIGHT_GREEN, greenNum2);
+ sbGreen.setProgress(greenNum2);
}
break;
case R.id.blueadd:
int blueNum1 = sbBlue.getProgress();
if (blueNum1 < 254) {
blueNum1++;
- try {
- sendJson(KEY_LIGHT_BLUE, blueNum1);
- } catch (JSONException e) {
- e.printStackTrace();
- }
+ sendCommand(KEY_LIGHT_BLUE, blueNum1);
+ sbBlue.setProgress(blueNum1);
}
break;
case R.id.bluesub:
int blueNum2 = sbBlue.getProgress();
if (blueNum2 > 0) {
blueNum2--;
- try {
- sendJson(KEY_LIGHT_BLUE, blueNum2);
- } catch (JSONException e) {
- e.printStackTrace();
- }
+ sendCommand(KEY_LIGHT_BLUE, blueNum2);
+ sbBlue.setProgress(blueNum2);
}
break;
case R.id.speedadd:
int speedNum1 = sbSpeed.getProgress();
if (speedNum1 < 10) {
speedNum1++;
- try {
- sendJson(KEY_SPEED, speedNum1 - 5);
- } catch (JSONException e) {
- e.printStackTrace();
- }
+ sendCommand(KEY_SPEED, speedNum1 - 5);
+ sbSpeed.setProgress(speedNum1);
}
break;
case R.id.speedsub:
int speedNum2 = sbSpeed.getProgress();
if (speedNum2 > 0) {
speedNum2--;
- try {
- sendJson(KEY_SPEED, speedNum2 - 5);
- } catch (JSONException e) {
- e.printStackTrace();
- }
+ sendCommand(KEY_SPEED, speedNum2 - 5);
+ sbSpeed.setProgress(speedNum2);
}
break;
default:
@@ -751,8 +726,6 @@ public class GosDeviceControlActivity extends GosControlModuleBaseActivity imple
super.onOptionsItemSelected(menu);
switch (menu.getItemId()) {
case android.R.id.home:
- mDevice.setSubscribe(false);
- mDevice.setListener(null);
finish();
break;
@@ -794,6 +767,9 @@ public class GosDeviceControlActivity extends GosControlModuleBaseActivity imple
return new String(hexChars);
}
+ /**
+ * Description:设置设备别名与备注
+ */
private void setDeviceInfo() {
final Dialog dialog = new AlertDialog.Builder(this).setView(new EditText(this)).create();
@@ -842,8 +818,6 @@ public class GosDeviceControlActivity extends GosControlModuleBaseActivity imple
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK) {
- mDevice.setSubscribe(false);
- mDevice.setListener(null);
finish();
}
return false;
diff --git a/src/com/gizwits/opensource/gokit/DeviceModule/GosDeviceListActivity.java b/src/com/gizwits/opensource/appkit/DeviceModule/GosDeviceListActivity.java
similarity index 93%
rename from src/com/gizwits/opensource/gokit/DeviceModule/GosDeviceListActivity.java
rename to src/com/gizwits/opensource/appkit/DeviceModule/GosDeviceListActivity.java
index 2ce9eca7bd594e23d762c98c9f5b285555bd9a72..2027043445c177f9f07a3d67fc3e57cec6ee6b98 100644
--- a/src/com/gizwits/opensource/gokit/DeviceModule/GosDeviceListActivity.java
+++ b/src/com/gizwits/opensource/appkit/DeviceModule/GosDeviceListActivity.java
@@ -1,4 +1,4 @@
-package com.gizwits.opensource.gokit.DeviceModule;
+package com.gizwits.opensource.appkit.DeviceModule;
import java.util.ArrayList;
import java.util.List;
@@ -9,14 +9,14 @@ import com.gizwits.gizwifisdk.api.GizWifiDevice;
import com.gizwits.gizwifisdk.api.GizWifiSDK;
import com.gizwits.gizwifisdk.enumration.GizWifiDeviceNetStatus;
import com.gizwits.gizwifisdk.enumration.GizWifiErrorCode;
-import com.gizwits.opensource.gokit.CommonModule.GosDeploy;
-import com.gizwits.opensource.gokit.ConfigModule.GosAirlinkChooseDeviceWorkWiFiActivity;
-import com.gizwits.opensource.gokit.ConfigModule.GosCheckDeviceWorkWiFiActivity;
-import com.gizwits.opensource.gokit.ControlModule.GosDeviceControlActivity;
-import com.gizwits.opensource.gokit.PushModule.GosPushManager;
-import com.gizwits.opensource.gokit.SettingsModule.GosSettiingsActivity;
-import com.gizwits.opensource.gokit.utils.NetUtils;
-import com.gizwits.opensource.gokit.view.SlideListView2;
+import com.gizwits.opensource.appkit.CommonModule.GosDeploy;
+import com.gizwits.opensource.appkit.ConfigModule.GosAirlinkChooseDeviceWorkWiFiActivity;
+import com.gizwits.opensource.appkit.ConfigModule.GosCheckDeviceWorkWiFiActivity;
+import com.gizwits.opensource.appkit.ControlModule.GosDeviceControlActivity;
+import com.gizwits.opensource.appkit.PushModule.GosPushManager;
+import com.gizwits.opensource.appkit.SettingsModule.GosSettiingsActivity;
+import com.gizwits.opensource.appkit.utils.NetUtils;
+import com.gizwits.opensource.appkit.view.SlideListView2;
import com.gizwits.opensource.gokit.R;
import android.annotation.SuppressLint;
@@ -164,7 +164,7 @@ public class GosDeviceListActivity extends GosDeviceModuleBaseActivity implement
GizWifiSDK.sharedInstance().getBoundDevices(uid, token, ProductKeyList);
}
- if (loginStatus == 0) {
+ if (loginStatus == 0&&GosDeploy.setAnonymousLogin()) {
loginStatus = 3;
GizWifiSDK.sharedInstance().userLoginAnonymous();
}
@@ -172,7 +172,7 @@ public class GosDeviceListActivity extends GosDeviceModuleBaseActivity implement
break;
case UPDATALIST:
-
+
progressDialog.cancel();
UpdateUI();
break;
@@ -196,7 +196,7 @@ public class GosDeviceListActivity extends GosDeviceModuleBaseActivity implement
case TOAST:
- Toast.makeText(GosDeviceListActivity.this, msg.obj.toString(), toastTime).show();
+ Toast.makeText(GosDeviceListActivity.this, msg.obj.toString(), 2000).show();
break;
case SHOWDIALOG:
@@ -297,6 +297,9 @@ public class GosDeviceListActivity extends GosDeviceModuleBaseActivity implement
@Override
protected void onResume() {
super.onResume();
+
+ GosDeviceModuleBaseActivity.deviceslist=GizWifiSDK.sharedInstance().getDeviceList();
+ UpdateUI();
// TODO GosMessageHandler.getSingleInstance().SetHandler(handler);
if (boundMessage.size() != 0) {
progressDialog.show();
@@ -307,9 +310,6 @@ public class GosDeviceListActivity extends GosDeviceModuleBaseActivity implement
} else {
Log.i("Apptest", "ListSize:" + boundMessage.size());
}
- } else {
- GosDeviceModuleBaseActivity.deviceslist = GizWifiSDK.sharedInstance().getDeviceList();
- UpdateUI();
}
}
@@ -318,7 +318,7 @@ public class GosDeviceListActivity extends GosDeviceModuleBaseActivity implement
public void onPause() {
super.onPause();
boundMessage.clear();
- // TODO GosMessageHandler.getSingleInstance().SetHandler(null);
+ GosMessageHandler.getSingleInstance().SetHandler(null);
}
@@ -430,7 +430,10 @@ public class GosDeviceListActivity extends GosDeviceModuleBaseActivity implement
GosPushManager.pushBindService(token);
} else {
loginStatus = 0;
- tryUserLoginAnonymous();
+ if(GosDeploy.setAnonymousLogin()){
+ tryUserLoginAnonymous();
+ }
+
}
}
@@ -438,7 +441,7 @@ public class GosDeviceListActivity extends GosDeviceModuleBaseActivity implement
progressDialog.cancel();
if (GizWifiErrorCode.GIZ_SDK_SUCCESS != result) {
// String unBoundFailed = (String) getText(R.string.unbound_failed);
- Toast.makeText(this, toastError(result), toastTime).show();
+ Toast.makeText(this, toastError(result), 2000).show();
}
}
@@ -470,7 +473,7 @@ public class GosDeviceListActivity extends GosDeviceModuleBaseActivity implement
protected void didChannelIDBind(GizWifiErrorCode result) {
Log.i("Apptest", result.toString());
if (GizWifiErrorCode.GIZ_SDK_SUCCESS != result) {
- Toast.makeText(this, toastError(result), toastTime).show();
+ Toast.makeText(this, toastError(result), 2000).show();
}
}
@@ -484,10 +487,10 @@ public class GosDeviceListActivity extends GosDeviceModuleBaseActivity implement
protected void didBindDevice(int error, String errorMessage, String did) {
progressDialog.cancel();
if (error != 0) {
- Toast.makeText(this, R.string.bound_failed + "\n" + errorMessage, toastTime).show();
+ Toast.makeText(this, R.string.bound_failed + "\n" + errorMessage, 2000).show();
} else {
- Toast.makeText(this, R.string.bound_successful, toastTime).show();
+ Toast.makeText(this, R.string.bound_successful, 2000).show();
}
};
@@ -501,10 +504,10 @@ public class GosDeviceListActivity extends GosDeviceModuleBaseActivity implement
protected void didBindDevice(GizWifiErrorCode result, java.lang.String did) {
progressDialog.cancel();
if (result != GizWifiErrorCode.GIZ_SDK_SUCCESS) {
- Toast.makeText(this, toastError(result), toastTime).show();
+ Toast.makeText(this, toastError(result), 2000).show();
} else {
- Toast.makeText(this, R.string.add_successful, toastTime).show();
+ Toast.makeText(this, R.string.add_successful, 2000).show();
}
}
@@ -575,7 +578,7 @@ public class GosDeviceListActivity extends GosDeviceModuleBaseActivity implement
break;
case R.id.action_addDevice:
if (!checkNetwork(GosDeviceListActivity.this)) {
- Toast.makeText(GosDeviceListActivity.this, R.string.network_error, toastTime).show();
+ Toast.makeText(GosDeviceListActivity.this, R.string.network_error, 2000).show();
} else {
intent = new Intent(GosDeviceListActivity.this, GosAirlinkChooseDeviceWorkWiFiActivity.class);
startActivity(intent);
@@ -656,7 +659,7 @@ public class GosDeviceListActivity extends GosDeviceModuleBaseActivity implement
case R.id.imgNoDevice:
case R.id.btnNoDevice:
if (!checkNetwork(GosDeviceListActivity.this)) {
- Toast.makeText(GosDeviceListActivity.this, R.string.network_error, toastTime).show();
+ Toast.makeText(GosDeviceListActivity.this, R.string.network_error, 2000).show();
return;
}
intent = new Intent(GosDeviceListActivity.this, GosAirlinkChooseDeviceWorkWiFiActivity.class);
@@ -721,7 +724,7 @@ public class GosDeviceListActivity extends GosDeviceModuleBaseActivity implement
}
}
- Toast.makeText(this, doubleClick, toastTime).show();
+ Toast.makeText(this, doubleClick, 2000).show();
tExit = new Timer();
tExit.schedule(new TimerTask() {
@Override
diff --git a/src/com/gizwits/opensource/gokit/DeviceModule/GosDeviceListAdapter.java b/src/com/gizwits/opensource/appkit/DeviceModule/GosDeviceListAdapter.java
similarity index 98%
rename from src/com/gizwits/opensource/gokit/DeviceModule/GosDeviceListAdapter.java
rename to src/com/gizwits/opensource/appkit/DeviceModule/GosDeviceListAdapter.java
index 567c4d616ecc8f90cd027be446112a7fb49dd88d..a5ebb38f165ddb7ecb0a19bec7f24b7cc9866c36 100644
--- a/src/com/gizwits/opensource/gokit/DeviceModule/GosDeviceListAdapter.java
+++ b/src/com/gizwits/opensource/appkit/DeviceModule/GosDeviceListAdapter.java
@@ -1,4 +1,4 @@
-package com.gizwits.opensource.gokit.DeviceModule;
+package com.gizwits.opensource.appkit.DeviceModule;
import java.util.List;
diff --git a/src/com/gizwits/opensource/gokit/DeviceModule/GosDeviceModuleBaseActivity.java b/src/com/gizwits/opensource/appkit/DeviceModule/GosDeviceModuleBaseActivity.java
similarity index 96%
rename from src/com/gizwits/opensource/gokit/DeviceModule/GosDeviceModuleBaseActivity.java
rename to src/com/gizwits/opensource/appkit/DeviceModule/GosDeviceModuleBaseActivity.java
index b85b72e2a27aaf0f830e1f6eabb89b61a4e229bd..d9ae950b2a1f16ead689d4c9bacd89fe14d11586 100644
--- a/src/com/gizwits/opensource/gokit/DeviceModule/GosDeviceModuleBaseActivity.java
+++ b/src/com/gizwits/opensource/appkit/DeviceModule/GosDeviceModuleBaseActivity.java
@@ -1,4 +1,4 @@
-package com.gizwits.opensource.gokit.DeviceModule;
+package com.gizwits.opensource.appkit.DeviceModule;
import java.util.ArrayList;
import java.util.List;
@@ -8,7 +8,7 @@ import com.gizwits.gizwifisdk.api.GizWifiSDK;
import com.gizwits.gizwifisdk.enumration.GizWifiErrorCode;
import com.gizwits.gizwifisdk.listener.GizWifiDeviceListener;
import com.gizwits.gizwifisdk.listener.GizWifiSDKListener;
-import com.gizwits.opensource.gokit.CommonModule.GosBaseActivity;
+import com.gizwits.opensource.appkit.CommonModule.GosBaseActivity;
public class GosDeviceModuleBaseActivity extends GosBaseActivity {
diff --git a/src/com/gizwits/opensource/gokit/DeviceModule/GosMessageHandler.java b/src/com/gizwits/opensource/appkit/DeviceModule/GosMessageHandler.java
similarity index 73%
rename from src/com/gizwits/opensource/gokit/DeviceModule/GosMessageHandler.java
rename to src/com/gizwits/opensource/appkit/DeviceModule/GosMessageHandler.java
index 89ecd02396de1175e49f9654e1998741355adc4c..878a25a2f19c72d5fb3929492e18a8b5b588ffd8 100644
--- a/src/com/gizwits/opensource/gokit/DeviceModule/GosMessageHandler.java
+++ b/src/com/gizwits/opensource/appkit/DeviceModule/GosMessageHandler.java
@@ -1,4 +1,4 @@
-package com.gizwits.opensource.gokit.DeviceModule;
+package com.gizwits.opensource.appkit.DeviceModule;
import java.util.ArrayList;
import java.util.List;
@@ -14,9 +14,9 @@ import android.os.Looper;
import android.os.Message;
import android.widget.RemoteViews;
-import com.gizwits.opensource.gokit.CommonModule.GosBaseActivity;
-import com.gizwits.opensource.gokit.ConfigModule.GosCheckDeviceWorkWiFiActivity;
-import com.gizwits.opensource.gokit.utils.NetUtils;
+import com.gizwits.opensource.appkit.CommonModule.GosBaseActivity;
+import com.gizwits.opensource.appkit.ConfigModule.GosCheckDeviceWorkWiFiActivity;
+import com.gizwits.opensource.appkit.utils.NetUtils;
import com.gizwits.opensource.gokit.R;
public class GosMessageHandler {
@@ -71,19 +71,26 @@ public class GosMessageHandler {
return;
}
newDeviceList.clear();
- List currentWifiScanResult = NetUtils.getCurrentWifiScanResult(mcContext);
+ List currentWifiScanResult = NetUtils
+ .getCurrentWifiScanResult(mcContext);
int flog = 0;
- for (ScanResult scanResult : currentWifiScanResult) {
- String ssid = scanResult.SSID;
- // 获取系统的NotificationManager服务
- nm = (NotificationManager) mcContext.getSystemService(Context.NOTIFICATION_SERVICE);
- if (ssid.contains(GosBaseActivity.SoftAP_Start) && ssid.length() > GosBaseActivity.SoftAP_Start.length()
- && !newDeviceList.toString().contains(ssid)) {
- newDeviceList.add(ssid);
- flog++;
- send(ssid, flog);
+ if (currentWifiScanResult != null) {
+ for (ScanResult scanResult : currentWifiScanResult) {
+ String ssid = scanResult.SSID;
+ // 获取系统的NotificationManager服务
+ nm = (NotificationManager) mcContext
+ .getSystemService(Context.NOTIFICATION_SERVICE);
+ if (ssid.contains(GosBaseActivity.SoftAP_Start)
+ && ssid.length() > GosBaseActivity.SoftAP_Start
+ .length()
+ && !newDeviceList.toString().contains(ssid)) {
+ newDeviceList.add(ssid);
+ flog++;
+ send(ssid, flog);
+ }
}
}
+
if (mainHandler != null && newDeviceList.size() > 0) {
mainHandler.sendEmptyMessage(SHOWDIALOG);
}
@@ -100,7 +107,8 @@ public class GosMessageHandler {
title = (String) mcContext.getText(R.string.not_title);
text = (String) mcContext.getText(R.string.not_text);
// 创建一个启动其他Activity的Intent
- Intent intent = new Intent(mcContext, GosCheckDeviceWorkWiFiActivity.class);
+ Intent intent = new Intent(mcContext,
+ GosCheckDeviceWorkWiFiActivity.class);
intent.putExtra("softssid", ssid);
PendingIntent pi = PendingIntent.getActivity(mcContext, 0, intent, 0);
Notification notify = new Notification();
@@ -113,7 +121,8 @@ public class GosMessageHandler {
notify.flags = Notification.FLAG_AUTO_CANCEL;
// 构造通知内容布局
- RemoteViews rv = new RemoteViews(mcContext.getPackageName(), R.layout.view_gos_notification);
+ RemoteViews rv = new RemoteViews(mcContext.getPackageName(),
+ R.layout.view_gos_notification);
// 设置通知内容的标题
rv.setTextViewText(R.id.tvContentTitle, title);
// 设置通知内容
diff --git a/src/com/gizwits/opensource/appkit/GosApplication.java b/src/com/gizwits/opensource/appkit/GosApplication.java
new file mode 100644
index 0000000000000000000000000000000000000000..e2be5ffe2c27a4a7079f65f4ff2ba07f10e12f74
--- /dev/null
+++ b/src/com/gizwits/opensource/appkit/GosApplication.java
@@ -0,0 +1,13 @@
+package com.gizwits.opensource.appkit;
+
+import android.app.Application;
+
+public class GosApplication extends Application {
+
+ public static int flag = 0;
+
+ public void onCreate() {
+ super.onCreate();
+
+ }
+}
diff --git a/src/com/gizwits/opensource/appkit/MessageCenter.java b/src/com/gizwits/opensource/appkit/MessageCenter.java
new file mode 100644
index 0000000000000000000000000000000000000000..c493f3080b7d07ccfea81c567a3d9f2ef1d22450
--- /dev/null
+++ b/src/com/gizwits/opensource/appkit/MessageCenter.java
@@ -0,0 +1,69 @@
+package com.gizwits.opensource.appkit;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+import android.content.Context;
+import android.os.Handler;
+import android.text.TextUtils;
+import android.widget.Toast;
+
+import com.gizwits.gizwifisdk.api.GizWifiSDK;
+import com.gizwits.gizwifisdk.enumration.GizLogPrintLevel;
+import com.gizwits.opensource.appkit.CommonModule.GosDeploy;
+import com.gizwits.opensource.gokit.R;
+
+public class MessageCenter {
+ private static MessageCenter mCenter;
+ int flag = 0;
+
+ GosDeploy gosDeploy;
+
+ private int SETCLOUD = 1111;
+
+ private MessageCenter(Context c) {
+ if (mCenter == null) {
+ init(c);
+ }
+ }
+
+ private void init(Context c) {
+ gosDeploy = new GosDeploy(c);
+ String AppID = GosDeploy.setAppID();
+ String AppSecret = GosDeploy.setAppSecret();
+ if (TextUtils.isEmpty(AppID) || AppID.contains("your_app_id") || TextUtils.isEmpty(AppSecret)
+ || AppSecret.contains("your_app_secret")) {
+ String AppID_Toast = c.getString(R.string.AppID_Toast);
+ if (flag == 0) {
+ Toast.makeText(c, AppID_Toast, Toast.LENGTH_LONG).show();
+ }
+ flag++;
+ } else {
+ // 启动SDK
+ ConcurrentHashMap serverMap = new ConcurrentHashMap();
+
+ serverMap.put("openAPIInfo", TextUtils.isEmpty((String) GosDeploy.infoMap.get("openAPIDomain"))
+ ? "api.gizwits.com" : (String) GosDeploy.infoMap.get("openAPIDomain"));
+ serverMap.put("siteInfo", TextUtils.isEmpty((String) GosDeploy.infoMap.get("siteDomain"))
+ ? "site.gizwits.com" : (String) GosDeploy.infoMap.get("siteDomain"));
+ serverMap.put("pushInfo", (String) GosDeploy.infoMap.get("pushDomain"));
+ GizWifiSDK.sharedInstance().startWithAppID(c, AppID, GosDeploy.setProductKeyList(), serverMap, false);
+ }
+ hand.sendEmptyMessageDelayed(SETCLOUD, 3000);
+
+ }
+
+ public static MessageCenter getInstance(Context c) {
+ if (mCenter == null) {
+ mCenter = new MessageCenter(c);
+ }
+ return mCenter;
+ }
+
+ Handler hand = new Handler() {
+ public void handleMessage(android.os.Message msg) {
+ GizWifiSDK.sharedInstance().setLogLevel(GizLogPrintLevel.GizLogPrintAll);
+
+ };
+ };
+
+}
\ No newline at end of file
diff --git a/src/com/gizwits/opensource/gokit/PushModule/BaiDuPushReceiver.java b/src/com/gizwits/opensource/appkit/PushModule/BaiDuPushReceiver.java
similarity index 96%
rename from src/com/gizwits/opensource/gokit/PushModule/BaiDuPushReceiver.java
rename to src/com/gizwits/opensource/appkit/PushModule/BaiDuPushReceiver.java
index 1a65cc9c275c7fef036a2eb58510f21416116687..bf89c1e7f7e50764b658a528ba60b955463f8e52 100644
--- a/src/com/gizwits/opensource/gokit/PushModule/BaiDuPushReceiver.java
+++ b/src/com/gizwits/opensource/appkit/PushModule/BaiDuPushReceiver.java
@@ -1,4 +1,4 @@
-package com.gizwits.opensource.gokit.PushModule;
+package com.gizwits.opensource.appkit.PushModule;
import java.util.List;
diff --git a/src/com/gizwits/opensource/gokit/PushModule/GosPushManager.java b/src/com/gizwits/opensource/appkit/PushModule/GosPushManager.java
similarity index 90%
rename from src/com/gizwits/opensource/gokit/PushModule/GosPushManager.java
rename to src/com/gizwits/opensource/appkit/PushModule/GosPushManager.java
index f082fbd03bb60edcac468f2b249d0d3d6bb02c39..00853dd1068ee20753128b3a55a882544a808562 100644
--- a/src/com/gizwits/opensource/gokit/PushModule/GosPushManager.java
+++ b/src/com/gizwits/opensource/appkit/PushModule/GosPushManager.java
@@ -1,15 +1,15 @@
-package com.gizwits.opensource.gokit.PushModule;
+package com.gizwits.opensource.appkit.PushModule;
import java.util.Set;
import com.baidu.android.pushservice.PushConstants;
import com.baidu.android.pushservice.PushManager;
+import com.baidu.android.pushservice.PushSettings;
import com.gizwits.gizwifisdk.api.GizWifiSDK;
import com.gizwits.gizwifisdk.enumration.GizPushType;
import com.gizwits.opensource.gokit.R;
-import com.gizwits.opensource.gokit.CommonModule.GosBaseActivity;
-import com.gizwits.opensource.gokit.CommonModule.GosDeploy;
-
+import com.gizwits.opensource.appkit.CommonModule.GosBaseActivity;
+import com.gizwits.opensource.appkit.CommonModule.GosDeploy;
import android.content.Context;
import android.text.TextUtils;
import android.util.Log;
@@ -56,11 +56,14 @@ public class GosPushManager {
}
public void bDPush() {
- String BDPushAppKey = GosDeploy.setBaiDuPushAppKey();
+ final String BDPushAppKey = GosDeploy.setBaiDuPushAppKey();
if (TextUtils.isEmpty(BDPushAppKey) || BDPushAppKey.contains("your_bpush_api_key")) {
GosBaseActivity.noIDAlert(context, R.string.BDPushAppID_Toast);
} else {
+
PushManager.startWork(context, PushConstants.LOGIN_TYPE_API_KEY, BDPushAppKey);
+ PushSettings.enableDebugMode(context, true);
+
}
}
diff --git a/src/com/gizwits/opensource/gokit/PushModule/JPushReceiver.java b/src/com/gizwits/opensource/appkit/PushModule/JPushReceiver.java
similarity index 82%
rename from src/com/gizwits/opensource/gokit/PushModule/JPushReceiver.java
rename to src/com/gizwits/opensource/appkit/PushModule/JPushReceiver.java
index 11a05a38419f1849bb10633e9223351e4182ec17..a85fd2fccddd454743fa04c472a2eeaf810f0bb1 100644
--- a/src/com/gizwits/opensource/gokit/PushModule/JPushReceiver.java
+++ b/src/com/gizwits/opensource/appkit/PushModule/JPushReceiver.java
@@ -1,4 +1,4 @@
-package com.gizwits.opensource.gokit.PushModule;
+package com.gizwits.opensource.appkit.PushModule;
import android.content.BroadcastReceiver;
import android.content.Context;
diff --git a/src/com/gizwits/opensource/gokit/SettingsModule/GosAboutActivity.java b/src/com/gizwits/opensource/appkit/SettingsModule/GosAboutActivity.java
similarity index 93%
rename from src/com/gizwits/opensource/gokit/SettingsModule/GosAboutActivity.java
rename to src/com/gizwits/opensource/appkit/SettingsModule/GosAboutActivity.java
index ccbf5e90093f8cb848d1a9808c40d5ed496dc3ba..c1d8063b1caf57de3da5d11bf9509dd4e0683624 100644
--- a/src/com/gizwits/opensource/gokit/SettingsModule/GosAboutActivity.java
+++ b/src/com/gizwits/opensource/appkit/SettingsModule/GosAboutActivity.java
@@ -1,8 +1,8 @@
-package com.gizwits.opensource.gokit.SettingsModule;
+package com.gizwits.opensource.appkit.SettingsModule;
import com.gizwits.gizwifisdk.api.GizWifiSDK;
+import com.gizwits.opensource.appkit.CommonModule.GosBaseActivity;
import com.gizwits.opensource.gokit.R;
-import com.gizwits.opensource.gokit.CommonModule.GosBaseActivity;
import android.app.ActionBar;
import android.content.Context;
diff --git a/src/com/gizwits/opensource/gokit/SettingsModule/GosSettiingsActivity.java b/src/com/gizwits/opensource/appkit/SettingsModule/GosSettiingsActivity.java
similarity index 91%
rename from src/com/gizwits/opensource/gokit/SettingsModule/GosSettiingsActivity.java
rename to src/com/gizwits/opensource/appkit/SettingsModule/GosSettiingsActivity.java
index 83e9279d05890b51a060fd94129ad5aaf390f409..08d827476ac25c2ce44355ab6b61fca5734933aa 100644
--- a/src/com/gizwits/opensource/gokit/SettingsModule/GosSettiingsActivity.java
+++ b/src/com/gizwits/opensource/appkit/SettingsModule/GosSettiingsActivity.java
@@ -1,7 +1,7 @@
-package com.gizwits.opensource.gokit.SettingsModule;
+package com.gizwits.opensource.appkit.SettingsModule;
+import com.gizwits.opensource.appkit.CommonModule.GosBaseActivity;
import com.gizwits.opensource.gokit.R;
-import com.gizwits.opensource.gokit.CommonModule.GosBaseActivity;
import android.content.Intent;
import android.os.Bundle;
diff --git a/src/com/gizwits/opensource/gokit/ThirdAccountModule/BaseUiListener.java b/src/com/gizwits/opensource/appkit/ThirdAccountModule/BaseUiListener.java
similarity index 88%
rename from src/com/gizwits/opensource/gokit/ThirdAccountModule/BaseUiListener.java
rename to src/com/gizwits/opensource/appkit/ThirdAccountModule/BaseUiListener.java
index 158b39fba5817dcdc2550da4b865440bf9ab1bfc..b9c52fe6da0b296cdcbeb66f1bcee6d23045fff5 100644
--- a/src/com/gizwits/opensource/gokit/ThirdAccountModule/BaseUiListener.java
+++ b/src/com/gizwits/opensource/appkit/ThirdAccountModule/BaseUiListener.java
@@ -1,4 +1,4 @@
-package com.gizwits.opensource.gokit.ThirdAccountModule;
+package com.gizwits.opensource.appkit.ThirdAccountModule;
import org.json.JSONObject;
diff --git a/src/com/gizwits/opensource/gokit/UserModule/GosForgetPasswordActivity.java b/src/com/gizwits/opensource/appkit/UserModule/GosForgetPasswordActivity.java
similarity index 93%
rename from src/com/gizwits/opensource/gokit/UserModule/GosForgetPasswordActivity.java
rename to src/com/gizwits/opensource/appkit/UserModule/GosForgetPasswordActivity.java
index 12f0edf4c88e19dd672b7db4138e0807d2b05172..0cb0d69d757c1002dd9c99f44b3b63469702c455 100644
--- a/src/com/gizwits/opensource/gokit/UserModule/GosForgetPasswordActivity.java
+++ b/src/com/gizwits/opensource/appkit/UserModule/GosForgetPasswordActivity.java
@@ -1,4 +1,4 @@
-package com.gizwits.opensource.gokit.UserModule;
+package com.gizwits.opensource.appkit.UserModule;
import java.util.Timer;
import java.util.TimerTask;
@@ -6,8 +6,8 @@ import java.util.TimerTask;
import com.gizwits.gizwifisdk.api.GizWifiSDK;
import com.gizwits.gizwifisdk.enumration.GizUserAccountType;
import com.gizwits.gizwifisdk.enumration.GizWifiErrorCode;
+import com.gizwits.opensource.appkit.CommonModule.GosDeploy;
import com.gizwits.opensource.gokit.R;
-import com.gizwits.opensource.gokit.CommonModule.GosDeploy;
import android.annotation.SuppressLint;
import android.content.Context;
@@ -46,7 +46,7 @@ public class GosForgetPasswordActivity extends GosUserModuleBaseActivity impleme
/** The cb Laws */
private CheckBox cbLaws;
-
+
/** The Button Drawable */
GradientDrawable drawable;
@@ -150,7 +150,7 @@ public class GosForgetPasswordActivity extends GosUserModuleBaseActivity impleme
cbLaws = (CheckBox) findViewById(R.id.cbLaws);
// 配置文件部署
- drawable =(GradientDrawable) GosDeploy.setButtonBackgroundColor();
+ drawable = (GradientDrawable) GosDeploy.setButtonBackgroundColor();
drawable.setCornerRadius(30);
btnGetCode.setBackgroundDrawable(drawable);
btnReset.setBackgroundDrawable(GosDeploy.setButtonBackgroundColor());
@@ -239,8 +239,10 @@ public class GosForgetPasswordActivity extends GosUserModuleBaseActivity impleme
progressDialog.cancel();
Message msg = new Message();
if (GizWifiErrorCode.GIZ_SDK_SUCCESS != result) {
+ // String sendFailed = (String) getText(R.string.send_failed);
msg.what = handler_key.TOAST.ordinal();
- msg.obj = toastError(result);
+ msg.obj = toastError(result);// sendFailed + "\n" +
+ // errorMessage;toastError(errorCode)
handler.sendMessage(msg);
} else {
handler.sendEmptyMessage(handler_key.SENDSUCCESSFUL.ordinal());
@@ -257,8 +259,9 @@ public class GosForgetPasswordActivity extends GosUserModuleBaseActivity impleme
progressDialog.cancel();
Message msg = new Message();
if (GizWifiErrorCode.GIZ_SDK_SUCCESS != result) {
+ // String resetFailed = (String) getText(R.string.reset_failed);
msg.what = handler_key.TOAST.ordinal();
- msg.obj = toastError(result);
+ msg.obj = toastError(result);// resetFailed + "\n" + errorMessage;
handler.sendMessage(msg);
} else {
msg.what = handler_key.TOAST.ordinal();
diff --git a/src/com/gizwits/opensource/gokit/UserModule/GosRegisterUserActivity.java b/src/com/gizwits/opensource/appkit/UserModule/GosRegisterUserActivity.java
similarity index 98%
rename from src/com/gizwits/opensource/gokit/UserModule/GosRegisterUserActivity.java
rename to src/com/gizwits/opensource/appkit/UserModule/GosRegisterUserActivity.java
index 755d17820ef0f1414e566300a9d4a036c0f41b0b..022873cc99b27a43fe03c5e4ed90bb99e576dfd3 100644
--- a/src/com/gizwits/opensource/gokit/UserModule/GosRegisterUserActivity.java
+++ b/src/com/gizwits/opensource/appkit/UserModule/GosRegisterUserActivity.java
@@ -1,14 +1,12 @@
-package com.gizwits.opensource.gokit.UserModule;
+package com.gizwits.opensource.appkit.UserModule;
import java.util.Timer;
import java.util.TimerTask;
-
import com.gizwits.gizwifisdk.api.GizWifiSDK;
import com.gizwits.gizwifisdk.enumration.GizUserAccountType;
import com.gizwits.gizwifisdk.enumration.GizWifiErrorCode;
+import com.gizwits.opensource.appkit.CommonModule.GosDeploy;
import com.gizwits.opensource.gokit.R;
-import com.gizwits.opensource.gokit.CommonModule.GosDeploy;
-
import android.annotation.SuppressLint;
import android.content.Context;
import android.graphics.drawable.GradientDrawable;
diff --git a/src/com/gizwits/opensource/gokit/UserModule/GosUserLoginActivity.java b/src/com/gizwits/opensource/appkit/UserModule/GosUserLoginActivity.java
similarity index 89%
rename from src/com/gizwits/opensource/gokit/UserModule/GosUserLoginActivity.java
rename to src/com/gizwits/opensource/appkit/UserModule/GosUserLoginActivity.java
index 8c6bc50f3e813d4ff9c2dbc97747dad3273f80e3..9a81b9606d0508bac8cb4919133620acc1aa22d3 100644
--- a/src/com/gizwits/opensource/gokit/UserModule/GosUserLoginActivity.java
+++ b/src/com/gizwits/opensource/appkit/UserModule/GosUserLoginActivity.java
@@ -1,24 +1,11 @@
-package com.gizwits.opensource.gokit.UserModule;
+package com.gizwits.opensource.appkit.UserModule;
import java.util.Timer;
import java.util.TimerTask;
+
import org.json.JSONException;
import org.json.JSONObject;
-import com.gizwits.gizwifisdk.api.GizWifiSDK;
-import com.gizwits.gizwifisdk.enumration.GizThirdAccountType;
-import com.gizwits.gizwifisdk.enumration.GizWifiErrorCode;
-import com.gizwits.opensource.gokit.CommonModule.GosBaseActivity;
-import com.gizwits.opensource.gokit.CommonModule.GosDeploy;
-import com.gizwits.opensource.gokit.DeviceModule.GosDeviceListActivity;
-import com.gizwits.opensource.gokit.PushModule.GosPushManager;
-import com.gizwits.opensource.gokit.ThirdAccountModule.BaseUiListener;
-import com.gizwits.opensource.gokit.GosApplication;
-import com.gizwits.opensource.gokit.R;
-import com.tencent.mm.sdk.modelmsg.SendAuth;
-import com.tencent.mm.sdk.openapi.IWXAPI;
-import com.tencent.mm.sdk.openapi.WXAPIFactory;
-import com.tencent.tauth.IUiListener;
-import com.tencent.tauth.Tencent;
+
import android.annotation.SuppressLint;
import android.content.Intent;
import android.os.Bundle;
@@ -39,6 +26,23 @@ import android.widget.TextView;
import android.widget.Toast;
import cn.jpush.android.api.JPushInterface;
+import com.gizwits.gizwifisdk.api.GizWifiSDK;
+import com.gizwits.gizwifisdk.enumration.GizThirdAccountType;
+import com.gizwits.gizwifisdk.enumration.GizWifiErrorCode;
+import com.gizwits.opensource.appkit.GosApplication;
+import com.gizwits.opensource.gokit.R;
+import com.gizwits.opensource.appkit.CommonModule.GosBaseActivity;
+import com.gizwits.opensource.appkit.CommonModule.GosDeploy;
+import com.gizwits.opensource.appkit.DeviceModule.GosDeviceListActivity;
+import com.gizwits.opensource.appkit.PushModule.GosPushManager;
+import com.gizwits.opensource.appkit.ThirdAccountModule.BaseUiListener;
+import com.gizwits.opensource.appkit.view.DotView;
+import com.tencent.mm.sdk.modelmsg.SendAuth;
+import com.tencent.mm.sdk.openapi.IWXAPI;
+import com.tencent.mm.sdk.openapi.WXAPIFactory;
+import com.tencent.tauth.IUiListener;
+import com.tencent.tauth.Tencent;
+
@SuppressLint("HandlerLeak")
public class GosUserLoginActivity extends GosUserModuleBaseActivity implements OnClickListener {
@@ -83,12 +87,8 @@ public class GosUserLoginActivity extends GosUserModuleBaseActivity implements O
/** The IUiListener */
IUiListener listener;
- // The Intent
Intent intent;
- // // The String
- // String name, psw;
-
/** The GizThirdAccountType */
public static GizThirdAccountType gizThirdAccountType;
@@ -151,10 +151,10 @@ public class GosUserLoginActivity extends GosUserModuleBaseActivity implements O
return;
}
}
- if (GosApplication.flag!=0) {
+ if (GosApplication.flag != 0) {
GosBaseActivity.noIDAlert(this, R.string.AppID_Toast);
}
-
+
// 在配置文件中选择推送类型（0：不开启推送，1：极光推送，2：百度推送。默认为0）
gosPushManager = new GosPushManager(GosDeploy.setPushType(), this);
@@ -169,23 +169,17 @@ public class GosUserLoginActivity extends GosUserModuleBaseActivity implements O
protected void onResume() {
super.onResume();
- etName.setText("");
- etPsw.setText("");
- etName.requestFocus();
JPushInterface.onResume(this);
autoLogin();
}
private void autoLogin() {
- if (TextUtils.isEmpty(spf.getString("UserName", ""))) {
- return;
- }
- if (TextUtils.isEmpty(spf.getString("PassWord", ""))) {
+ if (TextUtils.isEmpty(spf.getString("UserName", "")) || TextUtils.isEmpty(spf.getString("PassWord", ""))) {
return;
}
- baseHandler.sendEmptyMessage(handler_key.AUTO_LOGIN.ordinal());
+ baseHandler.sendEmptyMessageDelayed(handler_key.AUTO_LOGIN.ordinal(), 1000);
}
@Override
@@ -203,15 +197,34 @@ public class GosUserLoginActivity extends GosUserModuleBaseActivity implements O
tvPass = (TextView) findViewById(R.id.tvPass);
cbLaws = (CheckBox) findViewById(R.id.cbLaws);
+ DotView DotView = (com.gizwits.opensource.appkit.view.DotView) findViewById(R.id.dotView1);
llQQ = (LinearLayout) findViewById(R.id.llQQ);
llWechat = (LinearLayout) findViewById(R.id.llWechat);
-
+ String setTencentAppID = GosDeploy.setTencentAppID();
+ String setWechatAppID = GosDeploy.setWechatAppID();
+ // 判断腾讯和微信是否需要隐藏和显示
+ setWechatOrTencentIsVisable(DotView);
// 配置文件部署
btnLogin.setBackgroundDrawable(GosDeploy.setButtonBackgroundColor());
btnLogin.setTextColor(GosDeploy.setButtonTextColor());
}
+ protected void setWechatOrTencentIsVisable(DotView DotView) {
+ if (!GosDeploy.setWechat()) {
+
+ llWechat.setVisibility(View.GONE);
+ }
+ if (!GosDeploy.setQQ()) {
+
+ llQQ.setVisibility(View.GONE);
+ }
+
+ if (!GosDeploy.setWechat() && !GosDeploy.setQQ()) {
+ DotView.setVisibility(View.GONE);
+ }
+ }
+
private void initEvent() {
btnLogin.setOnClickListener(this);
tvRegister.setOnClickListener(this);
@@ -271,7 +284,6 @@ public class GosUserLoginActivity extends GosUserModuleBaseActivity implements O
noIDAlert(this, R.string.TencentAPPID_Toast);
return;
} else {
- Log.e("aaaaaaaaaaaaaaaaaaaaaaaaaaaaa", GosDeploy.setTencentAppID());
// 启动QQ登录SDK
mTencent = Tencent.createInstance(GosDeploy.setTencentAppID(), this.getApplicationContext());
}
@@ -284,7 +296,6 @@ public class GosUserLoginActivity extends GosUserModuleBaseActivity implements O
gizThirdAccountType = GizThirdAccountType.GizThirdQQ;
thirdUid = values.getString("openid").toString();
thirdToken = values.getString("access_token").toString();
- Log.e("AAAAAAAAAAAAAAAA", thirdToken);
msg.what = handler_key.THRED_LOGIN.ordinal();
baseHandler.sendMessage(msg);
} else {
@@ -308,13 +319,15 @@ public class GosUserLoginActivity extends GosUserModuleBaseActivity implements O
noIDAlert(this, R.string.WechatAppID_Toast);
return;
} else {
+
+ // 设置与WXEntryActivity共用Handler
+ setBaseHandler(baseHandler);
+
// 启动微信登录SDK
mIwxapi = WXAPIFactory.createWXAPI(this, wechatAppID, true);
// 将应用的AppID注册到微信
mIwxapi.registerApp(wechatAppID);
- // 设置与WXEntryActivity共用Handler
- setBaseHandler(baseHandler);
}
if (!(mIwxapi.isWXAppInstalled() && mIwxapi.isWXAppSupportAPI())) {
diff --git a/src/com/gizwits/opensource/gokit/UserModule/GosUserModuleBaseActivity.java b/src/com/gizwits/opensource/appkit/UserModule/GosUserModuleBaseActivity.java
similarity index 96%
rename from src/com/gizwits/opensource/gokit/UserModule/GosUserModuleBaseActivity.java
rename to src/com/gizwits/opensource/appkit/UserModule/GosUserModuleBaseActivity.java
index fd1376203e8dc668d727ebe002b7c3092ebb5659..569f784c7e9441d843d8d18c903e02cfba4b88c7 100644
--- a/src/com/gizwits/opensource/gokit/UserModule/GosUserModuleBaseActivity.java
+++ b/src/com/gizwits/opensource/appkit/UserModule/GosUserModuleBaseActivity.java
@@ -1,10 +1,9 @@
-package com.gizwits.opensource.gokit.UserModule;
+package com.gizwits.opensource.appkit.UserModule;
import com.gizwits.gizwifisdk.api.GizWifiSDK;
import com.gizwits.gizwifisdk.enumration.GizWifiErrorCode;
import com.gizwits.gizwifisdk.listener.GizWifiSDKListener;
-import com.gizwits.opensource.gokit.CommonModule.GosBaseActivity;
-
+import com.gizwits.opensource.appkit.CommonModule.GosBaseActivity;
import android.view.MenuItem;
public class GosUserModuleBaseActivity extends GosBaseActivity {
diff --git a/src/com/gizwits/opensource/appkit/utils/AssetsUtils.java b/src/com/gizwits/opensource/appkit/utils/AssetsUtils.java
new file mode 100644
index 0000000000000000000000000000000000000000..e5922be9858126e65e0035ed3d4996bebbfb959f
--- /dev/null
+++ b/src/com/gizwits/opensource/appkit/utils/AssetsUtils.java
@@ -0,0 +1,63 @@
+package com.gizwits.opensource.appkit.utils;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import android.content.Context;
+
+import com.gizwits.opensource.appkit.CommonModule.GosDeploy;
+
+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();
+ }
+}
+
+}
diff --git a/src/com/gizwits/opensource/gokit/utils/HTTPSTrustManager.java b/src/com/gizwits/opensource/appkit/utils/HTTPSTrustManager.java
similarity index 98%
rename from src/com/gizwits/opensource/gokit/utils/HTTPSTrustManager.java
rename to src/com/gizwits/opensource/appkit/utils/HTTPSTrustManager.java
index 4012a4ecd52cc96a99d381353584f082144e203a..16be05edff467f82643eeb44714306274f44ad34 100644
--- a/src/com/gizwits/opensource/gokit/utils/HTTPSTrustManager.java
+++ b/src/com/gizwits/opensource/appkit/utils/HTTPSTrustManager.java
@@ -1,4 +1,4 @@
-package com.gizwits.opensource.gokit.utils;
+package com.gizwits.opensource.appkit.utils;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
diff --git a/src/com/gizwits/opensource/gokit/utils/JsonUtils.java b/src/com/gizwits/opensource/appkit/utils/JsonUtils.java
similarity index 98%
rename from src/com/gizwits/opensource/gokit/utils/JsonUtils.java
rename to src/com/gizwits/opensource/appkit/utils/JsonUtils.java
index 9ad09c93b34767fe83daaf702efe3336a136dcae..25e65295b185f8053dc0e260b04ad296a8e672b5 100644
--- a/src/com/gizwits/opensource/gokit/utils/JsonUtils.java
+++ b/src/com/gizwits/opensource/appkit/utils/JsonUtils.java
@@ -3,7 +3,7 @@
* @charset UTF-8
* @author xiongxunxiang
*/
-package com.gizwits.opensource.gokit.utils;
+package com.gizwits.opensource.appkit.utils;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/src/com/gizwits/opensource/gokit/utils/NetUtils.java b/src/com/gizwits/opensource/appkit/utils/NetUtils.java
similarity index 95%
rename from src/com/gizwits/opensource/gokit/utils/NetUtils.java
rename to src/com/gizwits/opensource/appkit/utils/NetUtils.java
index 9a6fb30fbbc0ba99da2555183a81f039b87eab87..f90001061161415cf41578c8be87f103375bac71 100644
--- a/src/com/gizwits/opensource/gokit/utils/NetUtils.java
+++ b/src/com/gizwits/opensource/appkit/utils/NetUtils.java
@@ -15,7 +15,7 @@
* 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.gokit.utils;
+package com.gizwits.opensource.appkit.utils;
import java.util.List;
@@ -127,10 +127,14 @@ public class NetUtils {
if (context != null) {
WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
WifiInfo wifiInfo = wifiManager.getConnectionInfo();
- ssid = wifiInfo.getSSID();
- if (ssid.substring(0, 1).equals("\"") && ssid.substring(ssid.length() - 1).equals("\"")) {
- ssid = ssid.substring(1, ssid.length() - 1);
+
+ if(wifiInfo!=null){
+ ssid = wifiInfo.getSSID();
+ if (ssid.substring(0, 1).equals("\"") && ssid.substring(ssid.length() - 1).equals("\"")) {
+ ssid = ssid.substring(1, ssid.length() - 1);
+ }
}
+
}
return ssid;
}
@@ -149,10 +153,13 @@ public class NetUtils {
}
static public String getConnectWifiSsid(Context c) {
+ String ssid = "";
WifiManager wifiManager = (WifiManager) c.getSystemService(Context.WIFI_SERVICE);
WifiInfo wifiInfo = wifiManager.getConnectionInfo();
-
- return wifiInfo.getSSID();
+ if(wifiInfo!=null){
+ ssid = wifiInfo.getSSID();
+ }
+ return ssid;
}
// 以下是获得版本信息的工具方法
diff --git a/src/com/gizwits/opensource/gokit/utils/TrustAllSSLSocketFactory.java b/src/com/gizwits/opensource/appkit/utils/TrustAllSSLSocketFactory.java
similarity index 98%
rename from src/com/gizwits/opensource/gokit/utils/TrustAllSSLSocketFactory.java
rename to src/com/gizwits/opensource/appkit/utils/TrustAllSSLSocketFactory.java
index 8ad5d8c76844848c3e3105037142561bd6c68476..cb16e2aa08b907d479a421196cee2ef370a79110 100644
--- a/src/com/gizwits/opensource/gokit/utils/TrustAllSSLSocketFactory.java
+++ b/src/com/gizwits/opensource/appkit/utils/TrustAllSSLSocketFactory.java
@@ -1,4 +1,4 @@
-package com.gizwits.opensource.gokit.utils;
+package com.gizwits.opensource.appkit.utils;
import java.io.IOException;
import java.lang.reflect.Field;
diff --git a/src/com/gizwits/opensource/gokit/view/DotView.java b/src/com/gizwits/opensource/appkit/view/DotView.java
similarity index 96%
rename from src/com/gizwits/opensource/gokit/view/DotView.java
rename to src/com/gizwits/opensource/appkit/view/DotView.java
index ea938e24b29465f17179bb93ee4f8d02e53dc58f..31c2e41120d21431450bcda2f4978401103a943e 100644
--- a/src/com/gizwits/opensource/gokit/view/DotView.java
+++ b/src/com/gizwits/opensource/appkit/view/DotView.java
@@ -1,4 +1,4 @@
-package com.gizwits.opensource.gokit.view;
+package com.gizwits.opensource.appkit.view;
import com.gizwits.opensource.gokit.R;
diff --git a/src/com/gizwits/opensource/gokit/view/GifView.java b/src/com/gizwits/opensource/appkit/view/GifView.java
similarity index 99%
rename from src/com/gizwits/opensource/gokit/view/GifView.java
rename to src/com/gizwits/opensource/appkit/view/GifView.java
index 0c9b74b41c085bb26bdfea894784fd71accef6ac..b6dcf9f2d8eb945e5459ba7a322816626855cda0 100644
--- a/src/com/gizwits/opensource/gokit/view/GifView.java
+++ b/src/com/gizwits/opensource/appkit/view/GifView.java
@@ -1,4 +1,4 @@
-package com.gizwits.opensource.gokit.view;
+package com.gizwits.opensource.appkit.view;
import com.gizwits.opensource.gokit.R;
diff --git a/src/com/gizwits/opensource/gokit/view/RoundProgressBar.java b/src/com/gizwits/opensource/appkit/view/RoundProgressBar.java
similarity index 98%
rename from src/com/gizwits/opensource/gokit/view/RoundProgressBar.java
rename to src/com/gizwits/opensource/appkit/view/RoundProgressBar.java
index b17d7dd5944356afcdfc6b1070bd6f3d0478ceb2..73c92de5ef7f3517866e824a187d069c80142da0 100644
--- a/src/com/gizwits/opensource/gokit/view/RoundProgressBar.java
+++ b/src/com/gizwits/opensource/appkit/view/RoundProgressBar.java
@@ -1,7 +1,7 @@
-package com.gizwits.opensource.gokit.view;
+package com.gizwits.opensource.appkit.view;
+import com.gizwits.opensource.appkit.CommonModule.GosDeploy;
import com.gizwits.opensource.gokit.R;
-import com.gizwits.opensource.gokit.CommonModule.GosDeploy;
import android.content.Context;
import android.content.res.TypedArray;
diff --git a/src/com/gizwits/opensource/gokit/view/SlideListView2.java b/src/com/gizwits/opensource/appkit/view/SlideListView2.java
similarity index 99%
rename from src/com/gizwits/opensource/gokit/view/SlideListView2.java
rename to src/com/gizwits/opensource/appkit/view/SlideListView2.java
index 14b712a8affc7174b9f07c3d009c6301cabca18a..b69d95a19fb42889edd9e24583042d7ee1ef1f63 100644
--- a/src/com/gizwits/opensource/gokit/view/SlideListView2.java
+++ b/src/com/gizwits/opensource/appkit/view/SlideListView2.java
@@ -1,4 +1,4 @@
-package com.gizwits.opensource.gokit.view;
+package com.gizwits.opensource.appkit.view;
import android.annotation.SuppressLint;
import android.content.Context;
diff --git a/src/com/gizwits/opensource/gokit/wxapi/WXEntryActivity.java b/src/com/gizwits/opensource/appkit/wxapi/WXEntryActivity.java
similarity index 91%
rename from src/com/gizwits/opensource/gokit/wxapi/WXEntryActivity.java
rename to src/com/gizwits/opensource/appkit/wxapi/WXEntryActivity.java
index d0dcb29453f87026e80b4782ab0a9a86492eddb8..071853b99e8b99e83029ddaf5bbb0102fe7eaf16 100644
--- a/src/com/gizwits/opensource/gokit/wxapi/WXEntryActivity.java
+++ b/src/com/gizwits/opensource/appkit/wxapi/WXEntryActivity.java
@@ -1,14 +1,14 @@
-package com.gizwits.opensource.gokit.wxapi;
+package com.gizwits.opensource.appkit.wxapi;
import java.io.IOException;
import org.apache.http.client.ClientProtocolException;
import org.json.JSONException;
import org.json.JSONObject;
import com.gizwits.gizwifisdk.enumration.GizThirdAccountType;
-import com.gizwits.opensource.gokit.CommonModule.GosBaseActivity;
-import com.gizwits.opensource.gokit.CommonModule.GosDeploy;
-import com.gizwits.opensource.gokit.UserModule.GosUserLoginActivity;
-import com.gizwits.opensource.gokit.utils.JsonUtils;
+import com.gizwits.opensource.appkit.CommonModule.GosBaseActivity;
+import com.gizwits.opensource.appkit.CommonModule.GosDeploy;
+import com.gizwits.opensource.appkit.UserModule.GosUserLoginActivity;
+import com.gizwits.opensource.appkit.utils.JsonUtils;
import com.tencent.mm.sdk.modelbase.BaseReq;
import com.tencent.mm.sdk.modelbase.BaseResp;
import com.tencent.mm.sdk.modelmsg.SendAuth;
diff --git a/src/com/gizwits/opensource/gokit/GosApplication.java b/src/com/gizwits/opensource/gokit/GosApplication.java
deleted file mode 100644
index 926d5e405ae3723a96e8e8c4b0979af610d60397..0000000000000000000000000000000000000000
--- a/src/com/gizwits/opensource/gokit/GosApplication.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.gizwits.opensource.gokit;
-
-import java.util.concurrent.ConcurrentHashMap;
-import com.gizwits.gizwifisdk.api.GizWifiSDK;
-import com.gizwits.gizwifisdk.enumration.GizEventType;
-import com.gizwits.gizwifisdk.enumration.GizLogPrintLevel;
-import com.gizwits.gizwifisdk.enumration.GizWifiErrorCode;
-import com.gizwits.gizwifisdk.listener.GizWifiSDKListener;
-import com.gizwits.opensource.gokit.CommonModule.GosDeploy;
-
-import android.annotation.SuppressLint;
-import android.app.Application;
-import android.os.Handler;
-import android.text.TextUtils;
-import android.util.Log;
-
-public class GosApplication extends Application {
-
-
-
- public static int flag = 0;
-
- GosDeploy gosDeploy;
-
- ConcurrentHashMap cloudServiceMap = new ConcurrentHashMap();
-
- @SuppressLint("HandlerLeak")
- Handler handler = new Handler() {
- public void handleMessage(android.os.Message msg) {
-
- // 设置日志打印级别 （默认all且生成文件至SD卡）
- GizWifiSDK.sharedInstance().setLogLevel(GizLogPrintLevel.GizLogPrintAll);
-
- cloudServiceMap = GosDeploy.setCloudService();
-
- if (!cloudServiceMap.isEmpty()) {
- // 设置云端服务
- GizWifiSDK.sharedInstance().setCloudService(cloudServiceMap);
- }
-
- };
- };
-
- GizWifiSDKListener gizWifiSDKListener = new GizWifiSDKListener() {
-
- public void didNotifyEvent(com.gizwits.gizwifisdk.enumration.GizEventType eventType, Object eventSource,
- com.gizwits.gizwifisdk.enumration.GizWifiErrorCode eventID, String eventMessage) {
- if (GizEventType.GizEventSDK == eventType && GizWifiErrorCode.GIZ_SDK_START_SUCCESS == eventID) {
-
- } else {
- Log.e("Apptest", "SDK UN OPEN/n" + eventMessage);
- }
- };
-
- public void didGetCurrentCloudService(GizWifiErrorCode result,
- java.util.concurrent.ConcurrentHashMap cloudServiceInfo) {
-
- if (GizWifiErrorCode.GIZ_SDK_SUCCESS != result) {
- Log.e("Apptest", "CloudService Error: " + result.toString());
- }
- };
- };
-
- public void onCreate() {
- super.onCreate();
-
- // 读取配置文件
- gosDeploy = new GosDeploy(this);
- String AppID = GosDeploy.setAppID();
- String AppSecret = GosDeploy.setAppSecret();
-
- if (TextUtils.isEmpty(AppID) || AppID.contains("your_app_id") || TextUtils.isEmpty(AppSecret)
- || AppSecret.contains("your_app_secret")) {
- if (flag == 0) {
-
- }
- flag++;
- } else {
-
- // 启动SDK
- GizWifiSDK.sharedInstance().startWithAppID(getApplicationContext(), AppID);
-
- // 设置日志等级和云端服务
- handler.sendEmptyMessageDelayed(0, 3000);
-
- }
- };
-}
diff --git a/src/zxing/CaptureActivity.java b/src/zxing/CaptureActivity.java
index 0fbb6c9d00408fd32add0ffd2587ec6420c16922..d83d91eba4ae3c70375af82d73f2d5eb771bc471 100644
--- a/src/zxing/CaptureActivity.java
+++ b/src/zxing/CaptureActivity.java
@@ -42,9 +42,8 @@ import android.view.animation.TranslateAnimation;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.RelativeLayout;
-
+import com.gizwits.opensource.appkit.DeviceModule.GosDeviceListActivity;
import com.gizwits.opensource.gokit.R;
-import com.gizwits.opensource.gokit.DeviceModule.GosDeviceListActivity;
import com.google.zxing.Result;
/**