فهرست منبع

升级版本,解决已知bug

ChengJH 3 سال پیش
والد
کامیت
c327529c00

+ 7 - 7
WeiChat/src/main/AndroidManifest.xml

@@ -144,13 +144,13 @@
         </activity>
 
         <!-- 异常跳转页面 -->
-        <activity
-            android:name=".CustomCrashActivity"
-            android:process=":error_activity">
-            <intent-filter>
-                <action android:name="cat.ereza.customactivityoncrash.ERROR" />
-            </intent-filter>
-        </activity>
+<!--        <activity-->
+<!--            android:name=".CustomCrashActivity"-->
+<!--            android:process=":error_activity">-->
+<!--            <intent-filter>-->
+<!--                <action android:name="cat.ereza.customactivityoncrash.ERROR" />-->
+<!--            </intent-filter>-->
+<!--        </activity>-->
         <!-- 登录模块 -->
         <activity
             android:name="com.modular.login.activity.LoginActivity"

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -167,14 +167,14 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
      * @注释:主界面Fragment
      */
     private Fragment mLastFragment;
-    private MessageFragment mMessageFragment;
+    private MessageFragment mMessageFragment;//消息
     private MyFriendFragment mMyFriendFragment;//我的朋友---相互关注,单项关注,房间
     private WorkPlatFragment mWorksFragment;//工作
 //	private WorksFragment mWorksFragment;//工作
 
     private GroupChatFragment mGroupChatFragment;//群聊
     private MeFragment mMeFragment;//我
-    private ContactsFragment mBusinessCircleFragment;
+    private ContactsFragment mBusinessCircleFragment;//通讯录
     public static String BAIDU_PUSH = "BAIDUPUSH";
     public static String UU_STEP = "UUSTEP";
     public static String Q_SEARCH = "Q_SEARCH";

+ 2 - 2
WeiChat/version.properties

@@ -1,5 +1,5 @@
 #Fri May 22 09:52:19 CST 2020
 debugName=972
 debugCode=972
-versionName=723
-versionCode=277
+versionName=724
+versionCode=278

+ 1 - 0
app_core/common/src/main/AndroidManifest.xml

@@ -2,6 +2,7 @@
     package="com.core.app">
 
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CALL_PHONE" />
 

+ 1 - 0
app_core/common/src/main/java/com/core/base/BaseActivity.java

@@ -113,6 +113,7 @@ public abstract class BaseActivity extends ActionBackActivity {
     protected void onCreate(Bundle savedInstanceState) {
         initStyle();
         super.onCreate(savedInstanceState);
+        ct = MyApplication.getInstance().getApplicationContext();
         if (android.os.Build.VERSION.SDK_INT > 108) {
             Window window = getWindow();
             window.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS,

+ 6 - 6
app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -68,7 +68,7 @@ import java.util.Map;
 
 
 public class ViewUtil {
-    public static Context ct;
+    public static Context ct = MyApplication.getInstance().getApplicationContext();
     public static String erp_phone;
     public static String erp_password;
     public static String erp_master;
@@ -608,7 +608,7 @@ public class ViewUtil {
     }
 
 
-   
+
       /*@功能:管理平台的返回信息处理*/
     public static void LoginSucess(String json, String phone, String password) {
         LogUtil.d("AppInfo","phone:"+phone+"password:"+password);
@@ -719,7 +719,7 @@ public class ViewUtil {
 //                    select = 0;
 //                }
                 LogUtil.d("AppInfo","phone:"+phone+"password:"+password);
-                
+
                 showPopDialog((Activity) ct,itemsSelectType1s,phone,password);
 //                loginERPDialog = new MaterialDialog.Builder(ct)
 //                        .title(ct.getString(R.string.user_dialog_company))
@@ -775,7 +775,7 @@ public class ViewUtil {
                     adapter.notifyDataSetChanged();
                     ItemPopListAdapter.ViewHolder viewHolder= (ItemPopListAdapter.ViewHolder) view.getTag();
                     String text= viewHolder.tvItemName.getText().toString();
-                   
+
                     selectCompanyItems(selectId, text,erp_phone, erp_password);
                 }});
             popupWindow = new PopupWindow(view, windowManager.getDefaultDisplay().getWidth()- DensityUtil.dp2px(50), LinearLayout.LayoutParams.WRAP_CONTENT);
@@ -793,8 +793,8 @@ public class ViewUtil {
         popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
         popupWindow.showAtLocation(ct.getWindow().getDecorView(), Gravity.CENTER, 0, 0);
     }
-        
-  
+
+
 
     private static boolean selectCompanyItems(int which, CharSequence text, String phone, String password) {
         LogUtil.i("AppInfo","text;"+text+"phone:"+phone+" password:"+password);

+ 1 - 0
app_core/common/src/main/java/com/core/net/utils/NetUtils.java

@@ -16,6 +16,7 @@ public class NetUtils {
      * @param context
      * @return
      */
+    synchronized 
     public static boolean isNetWorkConnected(Context context) {
         if (context != null) {
             ConnectivityManager mConnectivityManager = (ConnectivityManager) context

+ 1 - 0
app_modular/appmessages/src/main/java/com/modular/appmessages/fragment/ApprovalListFragment.java

@@ -184,6 +184,7 @@ public class ApprovalListFragment extends ViewPagerLazyFragment implements OnSma
         mSimpleRefreshLayout.stopRefresh();
         if (!StringUtil.isEmpty(message)) {
             ToastUtil.showToast(ct, message);
+            LogUtil.i("ErrorSocket", "" + message);
         }
     }