Browse Source

订阅号UI

RaoMeng 9 năm trước cách đây
mục cha
commit
44c9b25607

+ 7 - 0
WeiChat/build.gradle

@@ -22,6 +22,11 @@ android {
         }
         multiDexEnabled true
         signingConfig signingConfigs.config
+
+        ndk {
+            // 设置支持的SO库架构
+            abiFilters 'armeabi' //, 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a'
+        }
     }
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
@@ -38,6 +43,7 @@ android {
     }
     productFlavors {
     }
+
 }
 
 buildscript {
@@ -94,4 +100,5 @@ dependencies {
     compile 'me.gujun.android.taggroup:library:1.4@aar'
     compile 'com.umeng.analytics:analytics:latest.integration'
     compile 'com.android.support:multidex:1.0.1'
+
 }

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

@@ -58,7 +58,6 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <!-- 百度自动更新 -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -520,6 +519,7 @@
         <activity
             android:name=".ui.erp.activity.oa.OAListActivity"
             android:label="外勤签到列表" />
+
     </application>
 
 </manifest>

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/MyApplication.java

@@ -33,7 +33,6 @@ import com.xzjmyk.pm.activity.volley.FastVolley;
 import org.apache.http.cookie.Cookie;
 
 import java.io.File;
-import java.util.List;
 
 public class MyApplication extends Application {
     /**
@@ -55,6 +54,7 @@ public class MyApplication extends Application {
     public void onCreate() {
         super.onCreate();
         INSTANCE = this;
+//        CrashReport.initCrashReport(getApplicationContext(), "900050585", false);
         PreferenceUtils.putBoolean(this, Constants.IS_NOTIFICATION, false);//不进行通知
         new Handler().postDelayed(new Runnable() {
             @Override

+ 3 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/NoticeMenuActivity.java

@@ -2,7 +2,6 @@ package com.xzjmyk.pm.activity.ui.erp.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -18,6 +17,9 @@ import com.xzjmyk.pm.activity.view.PullToRefreshSlideListView;
 
 import java.util.ArrayList;
 
+/**
+ * 通知公告页面
+ */
 public class NoticeMenuActivity extends BaseActivity {
     private ArrayList<Bean> beans;
     public static final int NEWS_REC = 0x01, GONGGAO_REC = 0x03, NOTICES_REC = 0x02;

+ 2 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -16,6 +16,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.lidroid.xutils.view.annotation.ViewInject;
+//import com.tencent.bugly.crashreport.CrashReport;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
@@ -167,6 +168,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     protected void onCreateView(Bundle savedInstanceState, boolean createView) {
         if (createView) {
             initView();
+//            CrashReport.testJavaCrash();
         }
     }
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/SubscriptionActivity.java

@@ -480,7 +480,7 @@ public class SubscriptionActivity extends BaseActivity {
                     isReColor = R.color.red;
                 } else {
                     isRe = "已读";
-                    isReColor = R.color.text_color;
+                    isReColor = R.color.white;
                 }
                 holder.big_isre_tv.setText(isRe);
                 holder.big_isre_tv.setTextColor(getResources().getColor(isReColor));

+ 8 - 0
WeiChat/src/main/res/drawable/selector_popup_btn.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/table_background" android:state_checked="true"/>
+    <item android:drawable="@color/table_background" android:state_selected="true"/>
+    <item android:drawable="@color/table_background" android:state_pressed="true"/>
+
+    <item android:drawable="@color/white"/>
+</selector>

+ 3 - 2
WeiChat/src/main/res/layout/bigimage_subscription.xml

@@ -56,8 +56,7 @@
     <RelativeLayout
         android:id="@+id/big_rl"
         android:layout_width="match_parent"
-        android:layout_height="130dp"
-        android:visibility="gone">
+        android:layout_height="130dp">
 
         <ImageView
             android:id="@+id/big_img"
@@ -93,6 +92,8 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_margin="10dp"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="5dp"
             android:textSize="@dimen/text_hine" />
     </RelativeLayout>
 </FrameLayout>

+ 2 - 2
WeiChat/src/main/res/layout/popupwindow_subscribe_menu.xml

@@ -10,8 +10,8 @@
         android:id="@+id/subscribe_menu_my"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/transparent"
         android:text="我的订阅"
+        android:background="@drawable/selector_popup_btn"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:padding="10dp"
@@ -21,8 +21,8 @@
         android:id="@+id/subscribe_menu_add"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/transparent"
         android:text="新增订阅"
+        android:background="@drawable/selector_popup_btn"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:padding="10dp"

+ 20 - 0
gradle.properties

@@ -0,0 +1,20 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
+android.useDeprecatedNdk=true