| .idea/misc.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationDialog.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/res/layout/loading_exception_log.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.idea/misc.xml
@@ -9,6 +9,7 @@ <entry key="app/src/main/res/layout/fragment_house_list.xml" value="0.10030395136778116" /> <entry key="app/src/main/res/layout/fragment_me.xml" value="0.10030395136778116" /> <entry key="app/src/main/res/layout/loading_confirm_input.xml" value="0.1" /> <entry key="app/src/main/res/layout/loading_exception_log.xml" value="0.1921875" /> <entry key="app/src/main/res/layout/toolbar_top_view_52.xml" value="0.10030395136778116" /> </map> </option> app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java
@@ -6,7 +6,7 @@ /*********是否正式服务器*********/ private static final boolean isOnlineServer = true; private static final boolean isOnlineServer = false; /*********正式环境*********/ private static final String APP_KEY_ONLINE = "CSZEMDJL"; private static final String APP_SECRET_ONLINE = "CSZEMDKBCSZEMDKR"; app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -89,7 +89,7 @@ public void onSuccess(HttpResponsePack httpResponsePack) { if (httpResponsePack != null && httpResponsePack.getData() != null) { Gson gson = new Gson(); String jsonStr = gson.toJson(httpResponsePack.getData().toString()); String jsonStr = gson.toJson(httpResponsePack.getData()); HouseInfoBeanClass houseInfoBeanClass = gson.fromJson(jsonStr, HouseInfoBeanClass.class); houseList.addAll(houseInfoBeanClass.getList()); //总共有多少页 @@ -132,7 +132,7 @@ public void onSuccess(HttpResponsePack httpResponsePack) { if (httpResponsePack != null && httpResponsePack.getData() != null) { Gson gson = new Gson(); String jsonStr = gson.toJson(httpResponsePack.getData().toString()); String jsonStr = gson.toJson(httpResponsePack.getData()); HouseInfoBean houseInfoBean = gson.fromJson(jsonStr, HouseInfoBean.class); if (cloudCallBeak != null) { cloudCallBeak.onSuccess(houseInfoBean); app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java
@@ -9,6 +9,7 @@ import androidx.appcompat.app.AlertDialog; import com.hdl.photovoltaic.enums.ShowErrorMode; import com.hdl.photovoltaic.widget.ConfirmationDialog; /** * 线程逻辑 @@ -86,12 +87,12 @@ /** * @param e 异常信息类 * @param ex 异常信息类 * @param context 上下文(不需要弹框填null) * @param showErrorMode 是否显示错误(不需要填null) */ private static void exception(Exception e, ShowErrorMode showErrorMode, Context context) { if (showErrorMode == null || context == null || e == null) { private static void exception(Exception ex, ShowErrorMode showErrorMode, Context context) { if (showErrorMode == null || context == null || ex == null) { return; } if (showErrorMode == ShowErrorMode.NO) { @@ -101,18 +102,42 @@ handler.post(new Runnable() { @Override public void run() { Dialog alertDialog = new AlertDialog.Builder(context). setTitle("抱歉程序出现错误了,点击\"确认\"获取更多详细信息."). setMessage(e.getMessage()). create(); alertDialog.show(); //提示 // AlertDialog alertDialog = new AlertDialog(context, androidx.fragment.R.style.TextAppearance_Compat_Notification); // alertDialog.setTitle("抱歉程序出现错误了"); // alertDialog.show(); // Toast.makeText(context, "抱歉程序出现错误了", Toast.LENGTH_SHORT).show(); ConfirmationDialog confirmationDialog = new ConfirmationDialog(context); confirmationDialog.setTitle("提示"); confirmationDialog.setContent("很抱歉,程序出现错误了,点击\"确认\"获取更多详细错误信息."); confirmationDialog.setConfirmation("确认"); confirmationDialog.setCancel("取消"); confirmationDialog.show(); confirmationDialog.setNoOnclickListener(new ConfirmationDialog.onNoOnclickListener() { @Override public void Cancel() { confirmationDialog.dismiss(); } }); confirmationDialog.setYesOnclickListener(new ConfirmationDialog.onYesOnclickListener() { @Override public void Confirm() { confirmationDialog.dismiss(); String s = getStackTrace(ex); } }); } }); } /** * @return 调用栈 */ private static String getStackTrace(Exception ex) { StringBuilder sb = new StringBuilder(""); StackTraceElement[] trace = ex.getStackTrace(); for (StackTraceElement stackTraceElement : trace) { sb.append(stackTraceElement).append("\n"); } return sb.toString(); } } app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
@@ -19,6 +19,7 @@ import com.hdl.photovoltaic.R; import com.hdl.photovoltaic.base.CustomBaseActivity; import com.hdl.photovoltaic.enums.ShowErrorMode; import com.hdl.photovoltaic.other.HdlResidenceLogic; import com.hdl.photovoltaic.ui.bean.LoginUserBean; import com.hdl.photovoltaic.ui.bean.LoginUserRegionBean; @@ -76,7 +77,7 @@ private void initView() { setStringDifferentColors(viewBinding.homeLoginPrivacyTv); //测试用 viewBinding.homeLoginAccountEt.setText("18402017839"); viewBinding.homeLoginAccountEt.setText("13375012441"); viewBinding.homeLoginPasswordEt.setText("123456"); isLoginTextViewEnabled(); } @@ -186,7 +187,7 @@ HdlAccountLogic.getInstance().regionByAccount(account, new CloudCallBeak<LoginUserRegionBean>() { @Override public void onSuccess(LoginUserRegionBean obj) { AppConfigManage.setUserRegionUrl(obj.getRegionUrl()); AppConfigManage.setUserRegionUrl("http://59.41.255.150:7777");//obj.getRegionUrl() HdlAccountLogic.getInstance().loginByPassword(account, password, new CloudCallBeak<LoginUserBean>() { @Override public void onSuccess(LoginUserBean obj) { @@ -196,18 +197,18 @@ HdlResidenceLogic.getInstance().getResidenceList(1, 100, new CloudCallBeak<Boolean>() { @Override public void onSuccess(Boolean obj) { hideLoading(); restoreButtonStyleToInitializeState(); startActivity(MyPowerStationActivity.class); } @Override public void onFailure(Exception exception) { } }); hideLoading(); restoreButtonStyleToInitializeState(); startActivity(MyPowerStationActivity.class); } }); } }, null, null); @@ -233,7 +234,15 @@ viewBinding.homeLoginExperienceTv.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { startActivity(MyPowerStationActivity.class); // startActivity(MyPowerStationActivity.class); HdlThreadLogic.runMainThread(new Runnable() { @Override public void run() { // } }, _mActivity, ShowErrorMode.YES); } });
@@ -21,6 +21,7 @@ import com.hdl.photovoltaic.base.CustomBaseFragment; import com.hdl.photovoltaic.databinding.LoadingConfirmInputBinding; import com.hdl.photovoltaic.other.HdlLogLogic; import com.hdl.photovoltaic.other.HdlResidenceLogic; import com.hdl.photovoltaic.other.HdlThreadLogic; import com.hdl.photovoltaic.other.HdlUniLogic; import com.hdl.photovoltaic.ui.adapter.HouseInfoAdapter; @@ -114,11 +115,12 @@ private void initData() { this.houseListBeanList = new ArrayList<>(); for (int i = 0; i < 11; i++) { HouseListBean houseListBean = new HouseListBean(); houseListBean.setHomeName("电站" + i); this.houseListBeanList.add(houseListBean); } // for (int i = 0; i < 11; i++) { // HouseListBean houseListBean = new HouseListBean(); // houseListBean.setHomeName("电站" + i); // this.houseListBeanList.add(houseListBean); // } this.houseListBeanList.addAll(HdlResidenceLogic.getInstance().getHouseInfoBeanList()); } @@ -148,6 +150,5 @@ } } } app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationDialog.java
@@ -100,7 +100,7 @@ * * @param content 内容 */ public void setContentText(String content) { public void setContent(String content) { if (TextUtils.isEmpty(content)) { return; } app/src/main/res/layout/loading_exception_log.xml
New file @@ -0,0 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent"> </androidx.constraintlayout.widget.ConstraintLayout>
