From 4d4413f9542242ad6c99f8321aae4af910bd8e90 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 16 六月 2023 15:35:32 +0800
Subject: [PATCH] 备份一下代码
---
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java | 3
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java | 39 ++++---
app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationInputDialog.java | 14 ++
app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java | 3
app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java | 22 ++--
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 122 ++++++++++++++++++++++++
app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | 1
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 61 ++++--------
.idea/misc.xml | 2
9 files changed, 189 insertions(+), 78 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 106e635..fd5a617 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,7 @@
<entry key="app/src/main/res/layout/activity_my_power_station.xml" value="0.10030395136778116" />
<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.10030395136778116" />
+ <entry key="app/src/main/res/layout/loading_confirm_input.xml" value="0.1" />
<entry key="app/src/main/res/layout/toolbar_top_view_52.xml" value="0.10030395136778116" />
</map>
</option>
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
index 28b4233..04629d3 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
@@ -73,7 +73,7 @@
}
/**
- * 鐧诲綍
+ * 鐧诲綍(B绔处鍙�)
* 閫氳繃璐﹀彿鍜屽瘑鐮�
*
* @param account 鎵嬫満鎴栬�呴偖绠�
@@ -124,20 +124,20 @@
}
/**
- * 鐧诲綍鎴愬姛淇濆瓨
+ * 鐧诲綍鎴愬姛淇濆瓨鐧诲綍淇℃伅
*/
private void saveUserData(LoginBean obj) {
if (obj != null) {
- UserConfigManage.getInstance().setLogin(true);
- UserConfigManage.getInstance().setAcceiptPolicy(true);
- UserConfigManage.getInstance().setLoginDateTime(System.currentTimeMillis());
- UserConfigManage.getInstance().setUserId(obj.getUserId());
- UserConfigManage.getInstance().setAccount(obj.getAccount());
- UserConfigManage.getInstance().setToken(obj.getAccessToken());
- UserConfigManage.getInstance().setHeaderPrefix(obj.getHeaderPrefix());
- UserConfigManage.getInstance().setRefreshToken(obj.getRefreshToken());
+ UserConfigManage.getInstance().setLogin(true);//鏄惁鐧诲綍
+ UserConfigManage.getInstance().setAcceiptPolicy(true);//鏄惁閫夋嫨闅愮鏀跨瓥
+ UserConfigManage.getInstance().setLoginDateTime(System.currentTimeMillis());//鐧诲綍鏃堕棿
+ UserConfigManage.getInstance().setUserId(obj.getUserId());//鐢ㄦ埛id
+ UserConfigManage.getInstance().setAccount(obj.getAccount());//璐﹀彿
+ UserConfigManage.getInstance().setToken(obj.getAccessToken());//Token
+ UserConfigManage.getInstance().setHeaderPrefix(obj.getHeaderPrefix());//璁よ瘉璇锋眰澶村墠缂�(搴曞眰璇锋眰缁熶竴鍔�)
+ UserConfigManage.getInstance().setRefreshToken(obj.getRefreshToken());//鍒锋柊Token
boolean isUserId = UserConfigManage.getInstance().getUserId().equals(obj.getUserId());
- UserConfigManage.getInstance().setTheSameLoginAccount(isUserId);
+ UserConfigManage.getInstance().setTheSameLoginAccount(isUserId);//涓庝笂涓�涓处鍙锋槸鍚﹀悓涓�涓�
}
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java
index 741a0b8..561ab7f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java
@@ -29,5 +29,8 @@
Log.d(tag, mgs);
}
+ public static void print(String mgs) {
+ System.out.println(mgs);
+ }
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
new file mode 100644
index 0000000..86bd98f
--- /dev/null
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -0,0 +1,122 @@
+package com.hdl.photovoltaic.other;
+
+
+import com.hdl.photovoltaic.config.UserConfigManage;
+import com.hdl.photovoltaic.uni.HDLUniMP;
+import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
+
+import org.json.JSONObject;
+
+
+import io.dcloud.feature.unimp.DCUniMPJSCallback;
+
+/**
+ * uni灏忕▼搴忕殑閫昏緫
+ */
+public class HdlUniLogic implements HDLUniMPSDKManager.IOnOtherUniMPEventCallBack {
+ private static volatile HdlUniLogic sHdlUniLogic;
+
+ /**
+ * 鑾峰彇褰撳墠瀵硅薄
+ *
+ * @return HdlAccountLogic
+ */
+ public static synchronized HdlUniLogic getInstance() {
+ if (sHdlUniLogic == null) {
+ synchronized (HdlUniLogic.class) {
+ if (sHdlUniLogic == null) {
+ sHdlUniLogic = new HdlUniLogic();
+ }
+ }
+
+ }
+ return sHdlUniLogic;
+ }
+
+ /**
+ * 鍘熺敓鎺ユ敹uni鍙戞潵鐨勬暟鎹�
+ *
+ * @param appId -uni灏忕▼搴忔寚瀹氱殑appId
+ * @param event -uni灏忕▼搴忓彂鏉ユ暟鎹�
+ * @param data JSONObject com.alibaba.fastjson瑙ｆ瀽澶勭悊
+ * @param callback callback.invoke(JSONObject) 鐢╟om.alibaba.fastjson
+ */
+ @Override
+ public void onOtherUniMPEventReceive(String appId, String event, Object data, DCUniMPJSCallback callback) {
+ if (!HDLUniMP.UNI_APP_ID.equals(appId)) {
+ return;
+ }
+ try {
+ org.json.JSONObject jsonObject = null;
+ if (data != null) {
+ jsonObject = new org.json.JSONObject(data.toString());
+ }
+ if (HDLUniMP.UNI_EVENT_HOME_CREATION.equals(event)) {
+ if (callback != null) {
+ callback.invoke(null);
+ }
+ }
+ HdlLogLogic.print("uni===鍘熺敓鎺ユ敹uni鍙戞潵鐨勬暟鎹�", event + "\r\n" + data);
+ } catch (Exception e) {
+ HdlLogLogic.print("uni===鍘熺敓鎺ユ敹uni鍙戞潵鐨勬暟鎹�", e.getMessage());
+ }
+
+ }
+
+ /**
+ * 鍘熺敓鎵撳紑uni鎸囧畾椤甸潰
+ *
+ * @param path 鎵撳紑璺緞
+ * @param jsonObject 闄勪欢鏁版嵁(娌℃湁鏁版嵁濉玭ull)
+ */
+ public void openUniMP(String path, JSONObject jsonObject) {
+ JSONObject json = this.createdJsonDate(jsonObject);
+ HDLUniMPSDKManager.getInstance().openUniMP(HDLUniMP.UNI_APP_ID, path, json, HdlUniLogic.this);
+ }
+
+ /**
+ * 鍘熺敓銆愪富鍔ㄣ�戝悜灏忕▼搴忓彂閫侀�氱煡浜嬩欢
+ * 娉ㄦ剰锛氶渶瑕佹彁鍓嶅皬绋嬪簭鍦ㄨ繍琛屾墠鍙垚鍔�
+ *
+ * @param topic 涓婚
+ * @param body 闄勪欢鏁版嵁(娌℃湁鏁版嵁濉玭ull)
+ */
+ public void sendUni(String topic, String body) {
+ try {
+ HDLUniMP.UniCallBackBaseBean callBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
+ callBackBaseBean.setTopic(topic);
+ callBackBaseBean.setData(body);
+ HDLUniMPSDKManager.getInstance().sendUniMPEvent(HDLUniMP.UNI_APP_ID, HDLUniMP.UNI_APP_ID, callBackBaseBean.getJSONObject());
+ } catch (Exception e) {
+ HdlLogLogic.print("uni===鍘熺敓涓诲姩鍚戝皬绋嬪簭鍙戦�侀�氱煡浜嬩欢", e.getMessage());
+ }
+ }
+
+ /**
+ * 妫�娴嬫槸鍚﹀綋鍓嶉〉闈㈡敞鍐岀殑callback,鏄殑璇濆垯绉婚櫎
+ */
+ public void checkRemoveOtherUniMPEventCallBack() {
+ HDLUniMPSDKManager.getInstance().checkRemoveOtherUniMPEventCallBack(this);
+ }
+
+ /**
+ * 缁勮uni鍙戦�佹暟鎹牸寮�
+ *
+ * @param data -闄勪欢鏁版嵁(娌℃湁鏁版嵁濉玭ull)
+ * @return JSONObject
+ */
+ public JSONObject createdJsonDate(JSONObject data) {
+ HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
+ try {
+ if (data == null) {
+ data = new JSONObject();
+ }
+ data.put("token", UserConfigManage.getInstance().getToken());
+ uniCallBackBaseBean.setData(data);
+ return uniCallBackBaseBean.getJSONObject();
+ } catch (Exception e) {
+ HdlLogLogic.print("uni===缁勮uni鍙戦�佹暟鎹牸寮�", e.getMessage());
+ }
+ return new JSONObject();
+ }
+}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
index 4b03a84..1d03953 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
@@ -306,5 +306,4 @@
view.setText(spannable);
}
-
}
\ No newline at end of file
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
index 3c595e7..17a4e7e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
@@ -1,5 +1,6 @@
package com.hdl.photovoltaic.ui.powerstation;
+import android.Manifest;
import android.content.Context;
import android.content.pm.PackageManager;
import android.hardware.camera2.CameraManager;
@@ -15,10 +16,12 @@
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.FragmentHouseListBinding;
import com.hdl.photovoltaic.base.CustomBaseFragment;
import com.hdl.photovoltaic.databinding.LoadingConfirmInputBinding;
import com.hdl.photovoltaic.other.HdlThreadLogic;
+import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.adapter.HouseInfoAdapter;
import com.hdl.photovoltaic.ui.bean.HouseListBean;
import com.hdl.photovoltaic.ui.device.FastScanActivity;
@@ -27,6 +30,7 @@
import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.photovoltaic.widget.ConfirmationInputDialog;
+import org.json.JSONException;
import org.json.JSONObject;
import java.util.ArrayList;
@@ -60,52 +64,13 @@
}
-
private void initEvent() {
viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
-// String path = "pages/powerStationDetail/index";
-//// HDLUniMP.UNI_PATH_MILLIMETER;//鍘熺敓閫氱煡灏忕▼搴忓湴鍧�
-// HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
-// uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_HOME_DETAILS);
-// uniCallBackBaseBean.setPath(path);
-// JSONObject jsonObject = uniCallBackBaseBean.getJSONObject();
-//
-// HDLUniMPSDKManager.getInstance().openUniMP(HDLUniMP.UNI_APP_ID, path, jsonObject, new HDLUniMPSDKManager.IOnOtherUniMPEventCallBack() {
-// @Override
-// public void onOtherUniMPEventReceive(String appid, String event, Object data, DCUniMPJSCallback callback) {
-//
-// }
-// });
-//
-// HdlThreadLogic.runThread(new Runnable() {
-// @Override
-// public void run() {
-// SystemClock.sleep(3000);
-// HDLUniMPSDKManager.getInstance().sendUniMPEvent(HDLUniMP.UNI_APP_ID, "2342", "764574574");
-//
-// }
-// }, null, null);
-
-
-// String[] ary = PermissionUtils.checkPermission(_mActivity, new String[]{Manifest.permission.CAMERA});
-// if (ary.length > 0) {
-// requestPermissions(ary, PermissionUtils.STATUS_SUCCESS);
-// } else {
-// startActivity(FastScanActivity.class);
-// }
-
- ConfirmationInputDialog confirmationInputDialog = new ConfirmationInputDialog(_mActivity);
- confirmationInputDialog.show();
- confirmationInputDialog.setNoOnclickListener(new ConfirmationInputDialog.onNoOnclickListener() {
- @Override
- public void Cancel() {
- confirmationInputDialog.dismiss();
- }
- });
-
+ // 鎵撳紑灏忕▼搴忛〉闈�
+ HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_HOME_CREATION, null);
}
});
//璁剧疆涓嬫媺绠ご棰滆壊
@@ -143,6 +108,18 @@
}
+ /**
+ * 鐢宠鏉冮檺
+ */
+ private void requestPermissions() {
+ String[] ary = PermissionUtils.checkPermission(_mActivity, new String[]{Manifest.permission.CAMERA});
+ if (ary.length > 0) {
+ requestPermissions(ary, PermissionUtils.STATUS_SUCCESS);
+ } else {
+ startActivity(FastScanActivity.class);
+ }
+ }
+
@Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
@@ -156,4 +133,6 @@
}
}
+
+
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
index 4fb75f6..edf9a9d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
@@ -19,28 +19,31 @@
public final static String UNI_EVENT_uniMPOnClose = "uni_MPOnClose";//鑷畾涔夊皬绋嬪簭鍏抽棴浜嬩欢
public final static String UNI_EVENT_GetAppParams = "uni_GetAppParams";//鑾峰彇APP搴旂敤淇℃伅
- //銆愬皬绋嬪簭銆戝彂閫佸埌銆愬師鐢熴�� 鍔犲墠缂�:uni_
- /*********浣忓畢銆愮數绔欍�戞ā鍧�*********/
- public final static String UNI_EVENT_HOME_LIST = "list";//鑾峰彇浣忓畢銆愮數绔欍�戝垪琛�
- public final static String UNI_EVENT_HOME_CREATION = "creation";//浣忓畢銆愮數绔欍�戝垱寤�
- public final static String UNI_EVENT_HOME_EDIT = "edit";//浣忓畢銆愮數绔欍�戠紪杈�
- public final static String UNI_EVENT_HOME_DETAILS = "details";//浣忓畢銆愮數绔欍�戣鎯�
- public final static String UNI_EVENT_Home_DEl = "del";//浣忓畢銆愮數绔欍�戝垹闄�
- /*********璁惧妯″潡*********/
- public final static String UNI_EVENT_DEVICE_LIST = "list";//閫嗗彉鍣ㄨ澶囧垪琛�
- public final static String UNI_EVENT_DEVICE_CHILD_LIST = "child_list";//閫嗗彉鍣ㄣ�愪笅鎸傘�戣澶囧垪琛�
- public final static String UNI_EVENT_DEVICE_ADD = "add";//璁惧娣诲姞
- public final static String UNI_EVENT_DEVICE_DEL = "del";//璁惧鍒犻櫎
- public final static String UNI_EVENT_DEVICE_OID = "oid";//璁惧銆愬寘鎷笅鎸傝澶囥�憃id鍒楄〃
-
-
- //銆愬師鐢熴�戜富鍔ㄥ彂閫佸埌銆愬皬绋嬪簭銆� 鍔犲墠缂�:app_
-
- //銆愬師鐢熴�戞墦寮�銆愬皬绋嬪簭銆戦〉闈㈣矾寰�:open_
+// //銆愬皬绋嬪簭銆戝彂閫佸埌銆愬師鐢熴�� 鍔犲墠缂�:uni_
+// /*********浣忓畢銆愮數绔欍�戞ā鍧�*********/
+// public final static String UNI_EVENT_HOME_LIST = "list";//鑾峰彇浣忓畢銆愮數绔欍�戝垪琛�
// public final static String UNI_EVENT_HOME_CREATION = "creation";//浣忓畢銆愮數绔欍�戝垱寤�
// public final static String UNI_EVENT_HOME_EDIT = "edit";//浣忓畢銆愮數绔欍�戠紪杈�
// public final static String UNI_EVENT_HOME_DETAILS = "details";//浣忓畢銆愮數绔欍�戣鎯�
// public final static String UNI_EVENT_Home_DEl = "del";//浣忓畢銆愮數绔欍�戝垹闄�
+// /*********璁惧妯″潡*********/
+// public final static String UNI_EVENT_DEVICE_LIST = "list";//閫嗗彉鍣ㄨ澶囧垪琛�
+// public final static String UNI_EVENT_DEVICE_CHILD_LIST = "child_list";//閫嗗彉鍣ㄣ�愪笅鎸傘�戣澶囧垪琛�
+// public final static String UNI_EVENT_DEVICE_ADD = "add";//璁惧娣诲姞
+// public final static String UNI_EVENT_DEVICE_DEL = "del";//璁惧鍒犻櫎
+// public final static String UNI_EVENT_DEVICE_OID = "oid";//璁惧銆愬寘鎷笅鎸傝澶囥�憃id鍒楄〃
+
+
+ //銆愬師鐢熴�戜富鍔ㄥ彂閫佸埌銆愬皬绋嬪簭銆� 鍔犲墠缂�:app_
+
+ //銆愬師鐢熴�戞墦寮�銆愬皬绋嬪簭銆戦〉闈㈣矾寰�
+ /*********浣忓畢妯″潡*********/
+ public final static String UNI_EVENT_HOME_CREATION = "pages/powerStation/powerStationCreate";//浣忓畢銆愮數绔欍�戝垱寤�
+ public final static String UNI_EVENT_HOME_EDIT = "pages/powerStation/powerStationEdit";//浣忓畢銆愮數绔欍�戠紪杈�
+ public final static String UNI_EVENT_HOME_DETAILS = "pages/powerStationDetail/index";//浣忓畢銆愮數绔欍�戣鎯�
+// public final static String UNI_EVENT_Home_DEl = "del";//浣忓畢銆愮數绔欍�戝垹闄�
+ /*********璁惧妯″潡*********/
+ //璁惧妯″潡鎵撳紑椤甸潰鍏ㄨ矾寰�
/**
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
index dd4722a..521c6d6 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
@@ -262,12 +262,9 @@
if (TextUtils.isEmpty(path)) {
uniMP = DCUniMPSDK.getInstance().openUniMP(mContext, uniAppId);
} else {
-
-
UniMPOpenConfiguration uniMPOpenConfiguration = new UniMPOpenConfiguration();
uniMPOpenConfiguration.path = path;
uniMPOpenConfiguration.extraData = jsonObject;
-
uniMP = DCUniMPSDK.getInstance().openUniMP(mContext, uniAppId, uniMPOpenConfiguration);
}
mCurrentAppId = uniAppId;//璁板綍褰撳墠灏忕▼搴�
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationInputDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationInputDialog.java
index 16c6e59..5040cf6 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationInputDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationInputDialog.java
@@ -8,6 +8,7 @@
import android.text.method.HideReturnsTransformationMethod;
import android.text.method.PasswordTransformationMethod;
import android.view.View;
+import android.widget.FrameLayout;
import androidx.annotation.NonNull;
import androidx.appcompat.content.res.AppCompatResources;
@@ -51,13 +52,20 @@
KeyboardStateObserverUtils.getKeyboardStateObserver((Activity) mContext).setKeyboardVisibilityListener(new KeyboardStateObserverUtils.OnKeyboardVisibilityListener() {
@Override
public void onKeyboardShow(int h) {
- //Toast.makeText(MainActivity.this,"閿洏寮瑰嚭",Toast.LENGTH_SHORT).show();
ConstraintSet cs = new ConstraintSet();
cs.clone(viewBinding.loadingParentCl);
// (viewBinding.loadingConfirmationRl.getTop()-dip2px(h))
+
cs.connect(R.id.loading_confirmation_rl, ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM, px2dip(h));//
//搴旂敤绾︽潫
cs.applyTo(viewBinding.loadingParentCl);
+
+
+// FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) viewBinding.loadingParentCl.getLayoutParams();
+// lp.bottomMargin = px2dip(h);
+// viewBinding.loadingParentCl.setLayoutParams(lp);
+
+
}
@Override
@@ -225,7 +233,7 @@
/**
* 鏍规嵁鎵嬫満鐨勫垎杈ㄧ巼浠� dp 鐨勫崟浣� 杞垚涓� px(鍍忕礌)
*/
- public int dip2px(float dpValue) {
+ private int dip2px(float dpValue) {
if (mContext == null) {
return 0;
}
@@ -236,7 +244,7 @@
/**
* 鏍规嵁鎵嬫満鐨勫垎杈ㄧ巼浠� px(鍍忕礌) 鐨勫崟浣� 杞垚涓� dp
*/
- public int px2dip(float pxValue) {
+ private int px2dip(float pxValue) {
final float scale = mContext.getResources().getDisplayMetrics().density;
return (int) (pxValue / scale + 0.5f);
}
--
Gitblit v1.8.0