From 4f6ae6bc491aafc58af59946ce463b964bb454c8 Mon Sep 17 00:00:00 2001
From: 8206503 <8206503@qq.com>
Date: Wed, 28 Dec 2016 17:16:31 +0800
Subject: [PATCH 001/898] =?UTF-8?q?=20=E9=85=8D=E7=BD=AE=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=94=9F=E6=88=90=E4=BC=81=E4=B8=9A=E7=89=88?=
=?UTF-8?q?=E5=92=8C=E6=99=AE=E9=80=9A=E7=89=88=202=20=E4=B8=AA=20apk?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/build.gradle | 35 +-
app/src/enterprise/AndroidManifest.xml | 953 ++++++++++++++++++
.../java/net/coding/program/TestActivity.java | 2 +-
app/src/main/res/layout/activity_login.xml | 12 +-
.../layout/message_list_list_item_left.xml | 232 ++---
.../layout/message_list_list_item_right.xml | 9 +-
app/src/main/res/values/strings.xml | 2 +
app/src/person/AndroidManifest.xml | 953 ++++++++++++++++++
8 files changed, 2068 insertions(+), 130 deletions(-)
create mode 100755 app/src/enterprise/AndroidManifest.xml
create mode 100755 app/src/person/AndroidManifest.xml
diff --git a/app/build.gradle b/app/build.gradle
index 7b31d4cf5..d26f94a9f 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,15 +11,30 @@ android {
}
defaultConfig {
- useLibrary 'org.apache.http.legacy'
- applicationId "net.coding.program"
+// useLibrary 'org.apache.http.legacy'
+// applicationId "net.coding.program"
renderscriptTargetApi 19
multiDexEnabled true
minSdkVersion 15
targetSdkVersion 23
}
+// flavorDimensions("person", "enterprise")
+
productFlavors {
+
+ person {
+ dimension "person"
+ applicationId "net.coding.program"
+ }
+ enterprise {
+ dimension "enterprise"
+ applicationId "net.coding.program.enterprise"
+// manifest.srcFile 'AndroidManifest.xml'
+
+
+ }
+
dev {
// dev utilizes minSDKVersion = 21 to allow the Android gradle plugin
// to pre-dex each module and produce an APK that can be tested on
@@ -123,9 +138,23 @@ dependencies {
apt {
arguments {
- androidManifestFile variant.outputs[0]?.processResources?.manifestFile
+// androidManifestFile variant.outputs[0].processResources.manifestFile
+// resourcePackageName "$android.defaultConfig.applicationId"
+// resourcePackageName 'coding.net.program'
+
+
+// androidManifestFile variant.outputs[0]?.processResources?.manifestFile
+ // if you have multiple outputs (when using splits), you may want to have other index than 0
+
+ // you should set your package name here if you are using different application IDs
+// resourcePackageName "$android.defaultConfig.applicationId"
+ resourcePackageName "net.coding.program"
+
+ logLevel "TRACE"
+ logAppenderConsole "true"
}
}
+
repositories {
flatDir {
dirs 'libs' //this way we can find the .aar file in libs folder
diff --git a/app/src/enterprise/AndroidManifest.xml b/app/src/enterprise/AndroidManifest.xml
new file mode 100755
index 000000000..c6840924c
--- /dev/null
+++ b/app/src/enterprise/AndroidManifest.xml
@@ -0,0 +1,953 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/net/coding/program/TestActivity.java b/app/src/main/java/net/coding/program/TestActivity.java
index 625257eab..6b6812707 100644
--- a/app/src/main/java/net/coding/program/TestActivity.java
+++ b/app/src/main/java/net/coding/program/TestActivity.java
@@ -33,7 +33,7 @@ public void click2(View v) {
public void click3(View v) {
// EntranceActivity_.intent(this).start();
- MainActivity_.intent(this).start();
+// MainActivity_.intent(this).start();
}
int mColor = 0xffff5722;
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 5510a56ca..7c290ab5c 100755
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -36,7 +36,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
-
-
+ app:darkness="true" />
+ app:dark="true" />
-
+ app:dark="true" />
diff --git a/app/src/main/res/layout/message_list_list_item_left.xml b/app/src/main/res/layout/message_list_list_item_left.xml
index b06f7f09b..cd9cc42d0 100755
--- a/app/src/main/res/layout/message_list_list_item_left.xml
+++ b/app/src/main/res/layout/message_list_list_item_left.xml
@@ -1,6 +1,7 @@
-
-
+
+
+ android:gravity="center_vertical|right"
+ android:orientation="horizontal">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:background="@color/transparent"
+ android:text="this is content"
+ android:textColor="@color/font_2"
+ android:textSize="16sp" />
+
+
+
-
-
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/message_list_list_item_right.xml b/app/src/main/res/layout/message_list_list_item_right.xml
index 10f504a17..48715f1f3 100755
--- a/app/src/main/res/layout/message_list_list_item_right.xml
+++ b/app/src/main/res/layout/message_list_list_item_right.xml
@@ -3,6 +3,7 @@
android:id = "@+id/message_list_list_item_right"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:paddingBottom="10dp">
@@ -27,7 +28,7 @@
android:layout_marginRight="12dp"
android:src="@drawable/ic_lancher" />
-
+ app:microSize="@dimen/image_single_micro_width"
+ app:minHeight="@dimen/image_single_min_size"
+ app:minWidth="@dimen/image_single_min_size" />
Coding
+ Coding 企业版
设置
刷新
MyActivity2
@@ -11,6 +12,7 @@
关注者列表
项目文件列表
TestActivity
+ Test 企业版
设置
我创建的
帮助与反馈
diff --git a/app/src/person/AndroidManifest.xml b/app/src/person/AndroidManifest.xml
new file mode 100755
index 000000000..c6840924c
--- /dev/null
+++ b/app/src/person/AndroidManifest.xml
@@ -0,0 +1,953 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From 7a0f47c4e62801ca069c189c6adebf4c1e6c229b Mon Sep 17 00:00:00 2001
From: 8206503 <8206503@qq.com>
Date: Thu, 29 Dec 2016 09:23:44 +0800
Subject: [PATCH 002/898] =?UTF-8?q?=E6=8A=BD=E5=8F=96=E5=AF=B9=20MainActiv?=
=?UTF-8?q?ity=20=E7=9A=84=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/enterprise/AndroidManifest.xml | 3 +-
.../net/coding/program/MyAppEnterprise.java | 19 +++++++++++++
.../program/compatible/ClassCompatImp.java | 15 ++++++++++
app/src/main/AndroidManifest.xml | 28 -------------------
.../net/coding/program/EntranceActivity.java | 5 ++--
.../net/coding/program/LoginActivity.java | 6 ++--
.../main/java/net/coding/program/MyApp.java | 4 +++
.../net/coding/program/MyPushReceiver.java | 3 +-
.../compatible/ClassCompatInterface.java | 10 +++++++
.../program/compatible/CodingCompat.java | 25 +++++++++++++++++
.../program/compatible/DefaultCompatImp.java | 14 ++++++++++
.../program/login/EmailRegisterActivity.java | 4 +--
.../phone/PhoneSetPasswordFragment2.java | 4 +--
.../program/project/init/InitProUtils.java | 4 +--
14 files changed, 103 insertions(+), 41 deletions(-)
create mode 100755 app/src/enterprise/java/net/coding/program/MyAppEnterprise.java
create mode 100644 app/src/enterprise/java/net/coding/program/compatible/ClassCompatImp.java
create mode 100644 app/src/main/java/net/coding/program/compatible/ClassCompatInterface.java
create mode 100644 app/src/main/java/net/coding/program/compatible/CodingCompat.java
create mode 100644 app/src/main/java/net/coding/program/compatible/DefaultCompatImp.java
diff --git a/app/src/enterprise/AndroidManifest.xml b/app/src/enterprise/AndroidManifest.xml
index c6840924c..867dbd354 100755
--- a/app/src/enterprise/AndroidManifest.xml
+++ b/app/src/enterprise/AndroidManifest.xml
@@ -83,10 +83,9 @@
diff --git a/app/src/enterprise/java/net/coding/program/MyAppEnterprise.java b/app/src/enterprise/java/net/coding/program/MyAppEnterprise.java
new file mode 100755
index 000000000..3bc3a0772
--- /dev/null
+++ b/app/src/enterprise/java/net/coding/program/MyAppEnterprise.java
@@ -0,0 +1,19 @@
+package net.coding.program;
+
+import net.coding.program.compatible.ClassCompatImp;
+import net.coding.program.compatible.CodingCompat;
+
+/**
+ * Created by cc191954 on 14-8-9.
+ * 用来做一些初始化工作，比如设置 host，
+ * 初始化图片库配置
+ */
+public class MyAppEnterprise extends MyApp {
+
+ @Override
+ public void onCreate() {
+ super.onCreate();
+
+ CodingCompat.init(new ClassCompatImp());
+ }
+}
diff --git a/app/src/enterprise/java/net/coding/program/compatible/ClassCompatImp.java b/app/src/enterprise/java/net/coding/program/compatible/ClassCompatImp.java
new file mode 100644
index 000000000..a8ac7a06a
--- /dev/null
+++ b/app/src/enterprise/java/net/coding/program/compatible/ClassCompatImp.java
@@ -0,0 +1,15 @@
+package net.coding.program.compatible;
+
+import net.coding.program.MainActivity_;
+
+/**
+ * Created by chenchao on 2016/12/28.
+ */
+
+public class ClassCompatImp implements ClassCompatInterface {
+
+ @Override
+ public Class getMainActivity() {
+ return MainActivity_.class;
+ }
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c6840924c..5fa4a3dd6 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -83,10 +83,8 @@
@@ -232,32 +230,6 @@
android:configChanges="orientation|keyboardHidden"
android:windowSoftInputMode="adjustPan|stateAlwaysVisible|adjustUnspecified|stateHidden"
android:screenOrientation="portrait" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
getMainActivity();
+}
diff --git a/app/src/main/java/net/coding/program/compatible/CodingCompat.java b/app/src/main/java/net/coding/program/compatible/CodingCompat.java
new file mode 100644
index 000000000..41aafe881
--- /dev/null
+++ b/app/src/main/java/net/coding/program/compatible/CodingCompat.java
@@ -0,0 +1,25 @@
+package net.coding.program.compatible;
+
+/**
+ * Created by chenchao on 2016/12/28.
+ */
+
+public class CodingCompat implements ClassCompatInterface {
+
+ private static ClassCompatInterface substance;
+
+ private CodingCompat() {}
+
+ public static void init(ClassCompatInterface substance) {
+ CodingCompat.substance = substance;
+ }
+
+ public static ClassCompatInterface instance() {
+ return substance;
+ }
+
+ @Override
+ public Class getMainActivity() {
+ return substance.getMainActivity();
+ }
+}
diff --git a/app/src/main/java/net/coding/program/compatible/DefaultCompatImp.java b/app/src/main/java/net/coding/program/compatible/DefaultCompatImp.java
new file mode 100644
index 000000000..479aaa3e0
--- /dev/null
+++ b/app/src/main/java/net/coding/program/compatible/DefaultCompatImp.java
@@ -0,0 +1,14 @@
+package net.coding.program.compatible;
+
+import net.coding.program.MainActivity_;
+
+/**
+ * Created by chenchao on 2016/12/29.
+ */
+
+public class DefaultCompatImp implements ClassCompatInterface {
+ @Override
+ public Class getMainActivity() {
+ return MainActivity_.class;
+ }
+}
diff --git a/app/src/main/java/net/coding/program/login/EmailRegisterActivity.java b/app/src/main/java/net/coding/program/login/EmailRegisterActivity.java
index 85e8ebf78..38d285d97 100644
--- a/app/src/main/java/net/coding/program/login/EmailRegisterActivity.java
+++ b/app/src/main/java/net/coding/program/login/EmailRegisterActivity.java
@@ -11,7 +11,6 @@
import com.loopj.android.http.RequestParams;
import net.coding.program.MainActivity;
-import net.coding.program.MainActivity_;
import net.coding.program.MyApp;
import net.coding.program.R;
import net.coding.program.common.Global;
@@ -24,6 +23,7 @@
import net.coding.program.common.util.SingleToast;
import net.coding.program.common.util.ViewStyleUtil;
import net.coding.program.common.widget.LoginEditText;
+import net.coding.program.compatible.CodingCompat;
import net.coding.program.model.AccountInfo;
import net.coding.program.model.UserObject;
@@ -148,7 +148,7 @@ static void parseRegisterSuccess(Activity activity, JSONObject respanse) {
AccountInfo.saveLastLoginName(activity, user.name);
- activity.startActivity(new Intent(activity, MainActivity_.class));
+ activity.startActivity(new Intent(activity, CodingCompat.instance().getMainActivity()));
activity.sendBroadcast(new Intent(GuideActivity.BROADCAST_GUIDE_ACTIVITY));
activity.setResult(Activity.RESULT_OK);
diff --git a/app/src/main/java/net/coding/program/login/phone/PhoneSetPasswordFragment2.java b/app/src/main/java/net/coding/program/login/phone/PhoneSetPasswordFragment2.java
index 98451caba..b5e10397f 100644
--- a/app/src/main/java/net/coding/program/login/phone/PhoneSetPasswordFragment2.java
+++ b/app/src/main/java/net/coding/program/login/phone/PhoneSetPasswordFragment2.java
@@ -10,7 +10,6 @@
import com.loopj.android.http.AsyncHttpClient;
import com.loopj.android.http.RequestParams;
-import net.coding.program.MainActivity_;
import net.coding.program.MyApp;
import net.coding.program.R;
import net.coding.program.common.Global;
@@ -26,6 +25,7 @@
import net.coding.program.common.util.ViewStyleUtil;
import net.coding.program.common.widget.LoginEditText;
import net.coding.program.common.widget.ValidePhoneView;
+import net.coding.program.compatible.CodingCompat;
import net.coding.program.model.AccountInfo;
import net.coding.program.model.UserObject;
@@ -144,7 +144,7 @@ public void onMySuccess(JSONObject respanse) {
getActivity().sendBroadcast(new Intent(GuideActivity.BROADCAST_GUIDE_ACTIVITY));
getActivity().finish();
- startActivity(new Intent(getActivity(), MainActivity_.class));
+ startActivity(new Intent(getActivity(), CodingCompat.instance().getMainActivity()));
}
@Override
diff --git a/app/src/main/java/net/coding/program/project/init/InitProUtils.java b/app/src/main/java/net/coding/program/project/init/InitProUtils.java
index a708b7fd3..3cf6c0810 100644
--- a/app/src/main/java/net/coding/program/project/init/InitProUtils.java
+++ b/app/src/main/java/net/coding/program/project/init/InitProUtils.java
@@ -6,7 +6,7 @@
import android.text.TextUtils;
import android.view.inputmethod.InputMethodManager;
-import net.coding.program.MainActivity_;
+import net.coding.program.compatible.CodingCompat;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -23,7 +23,7 @@ public class InitProUtils {
//跳转到主界面并刷新项目列表
public static void intentToMain(Context context) {
- Intent intent = new Intent(context, MainActivity_.class);
+ Intent intent = new Intent(context, CodingCompat.instance().getMainActivity());
intent.putExtra("action", FLAG_REFRESH);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
context.startActivity(intent);
From 628dc8e75f9f909d4e5ee8fb8ce3f5816038f882 Mon Sep 17 00:00:00 2001
From: 8206503 <8206503@qq.com>
Date: Thu, 29 Dec 2016 09:27:22 +0800
Subject: [PATCH 003/898] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E7=94=A8?=
=?UTF-8?q?=E7=9A=84=E7=B1=BB=20CustomMoreActivity?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../common/base/CustomMoreActivity.java | 67 -------------------
1 file changed, 67 deletions(-)
delete mode 100644 app/src/main/java/net/coding/program/common/base/CustomMoreActivity.java
diff --git a/app/src/main/java/net/coding/program/common/base/CustomMoreActivity.java b/app/src/main/java/net/coding/program/common/base/CustomMoreActivity.java
deleted file mode 100644
index e348e6230..000000000
--- a/app/src/main/java/net/coding/program/common/base/CustomMoreActivity.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package net.coding.program.common.base;
-
-import net.coding.program.common.Global;
-import net.coding.program.common.ui.BaseActivity;
-
-import org.androidannotations.annotations.EActivity;
-import org.androidannotations.annotations.OptionsItem;
-
-/**
- * Created by chenchao on 15/3/9.
- */
-
-@EActivity
-public abstract class CustomMoreActivity extends BaseActivity {
-
- // protected abstract View getAnchorView();
- protected abstract String getLink();
-
-// @OptionsItem
-// protected void action_more() {
-// showRightTopPop();
-// }
-//
-// private DialogUtil.RightTopPopupWindow mRightTopPopupWindow = null;
-
- @OptionsItem
- protected final void action_copy() {
- String link = getLink();
- if (link.isEmpty()) {
- showButtomToast("复制链接失败");
- } else {
- Global.copy(CustomMoreActivity.this, link);
- showButtomToast("已复制链接 " + link);
- }
- }
-
-// private void showRightTopPop() {
-// if (mRightTopPopupWindow == null) {
-// ArrayList popupItemArrayList = new ArrayList<>();
-// DialogUtil.RightTopPopupItem downloadItem = new DialogUtil.RightTopPopupItem(getString(R.string.copy_link), R.drawable.ic_menu_link);
-// popupItemArrayList.add(downloadItem);
-// mRightTopPopupWindow = DialogUtil.initRightTopPopupWindow(this, popupItemArrayList, onRightTopPopupItemClickListener);
-// }
-//
-// mRightTopPopupWindow.adapter.notifyDataSetChanged();
-//
-// Rect rectgle = new Rect();
-// Window window = getWindow();
-// window.getDecorView().getWindowVisibleDisplayFrame(rectgle);
-// int contentViewTop =
-// window.findViewById(Window.ID_ANDROID_CONTENT).getTop();
-// mRightTopPopupWindow.adapter.notifyDataSetChanged();
-// mRightTopPopupWindow.setAnimationStyle(android.R.style.Animation_Dialog);
-// mRightTopPopupWindow.showAtLocation(getAnchorView(), Gravity.TOP | Gravity.RIGHT, 0, contentViewTop);
-// }
-//
-// private AdapterView.OnItemClickListener onRightTopPopupItemClickListener = new AdapterView.OnItemClickListener() {
-// @Override
-// public void onItemClick(AdapterView adapterView, View view, int position, long id) {
-// switch (position) {
-// case 0:
-// break;
-// }
-// mRightTopPopupWindow.dismiss();
-// }
-// };
-}
From 6318c69ef5ca1a7b60f80be547c7e7b368a1531e Mon Sep 17 00:00:00 2001
From: 8206503 <8206503@qq.com>
Date: Thu, 29 Dec 2016 11:03:05 +0800
Subject: [PATCH 004/898] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=B8=BB=E7=95=8C?=
=?UTF-8?q?=E9=9D=A2=E7=9A=84=E5=86=92=E6=B3=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/enterprise/AndroidManifest.xml | 24 ++--
.../program/EnterpriseMainActivity.java | 111 ++++++++++++++++++
.../program/compatible/ClassCompatImp.java | 4 +-
.../res/layout/activity_enterprise_main.xml | 20 ++++
.../enterprise/res/values-w820dp/dimens.xml | 6 +
app/src/enterprise/res/values/dimens.xml | 5 +
app/src/enterprise/res/values/strings.xml | 1 +
app/src/enterprise/res/xml/bottombar_tabs.xml | 19 +++
.../enterprise/res/xml/bottombar_tabs1.xml | 23 ++++
.../java/net/coding/program/MainActivity.java | 12 +-
.../program/common/ui/BaseListActivity.java | 8 +-
app/src/person/AndroidManifest.xml | 16 +--
.../res/layout/activity_coding_main.xml | 12 ++
app/src/person/res/values-w820dp/dimens.xml | 6 +
app/src/person/res/values/dimens.xml | 5 +
app/src/person/res/values/strings.xml | 1 +
16 files changed, 248 insertions(+), 25 deletions(-)
create mode 100644 app/src/enterprise/java/net/coding/program/EnterpriseMainActivity.java
create mode 100644 app/src/enterprise/res/layout/activity_enterprise_main.xml
create mode 100644 app/src/enterprise/res/values-w820dp/dimens.xml
create mode 100644 app/src/enterprise/res/values/dimens.xml
create mode 100644 app/src/enterprise/res/values/strings.xml
create mode 100644 app/src/enterprise/res/xml/bottombar_tabs.xml
create mode 100644 app/src/enterprise/res/xml/bottombar_tabs1.xml
create mode 100644 app/src/person/res/layout/activity_coding_main.xml
create mode 100644 app/src/person/res/values-w820dp/dimens.xml
create mode 100644 app/src/person/res/values/dimens.xml
create mode 100644 app/src/person/res/values/strings.xml
diff --git a/app/src/enterprise/AndroidManifest.xml b/app/src/enterprise/AndroidManifest.xml
index 867dbd354..2e0044a92 100755
--- a/app/src/enterprise/AndroidManifest.xml
+++ b/app/src/enterprise/AndroidManifest.xml
@@ -55,8 +55,8 @@
-
-
+
+
@@ -210,12 +210,12 @@
+ android:theme="@style/ActionbarSpannerTheme1"
+ android:windowSoftInputMode="stateAlwaysVisible|adjustUnspecified|stateHidden" />
+ android:windowSoftInputMode="adjustPan|stateAlwaysVisible|adjustUnspecified|stateHidden" />
+
\ No newline at end of file
diff --git a/app/src/enterprise/java/net/coding/program/EnterpriseMainActivity.java b/app/src/enterprise/java/net/coding/program/EnterpriseMainActivity.java
new file mode 100644
index 000000000..291ce146e
--- /dev/null
+++ b/app/src/enterprise/java/net/coding/program/EnterpriseMainActivity.java
@@ -0,0 +1,111 @@
+package net.coding.program;
+
+import android.os.Build;
+import android.support.v4.app.Fragment;
+import android.support.v4.view.ViewCompat;
+import android.view.View;
+
+import com.roughike.bottombar.OnTabSelectListener;
+
+import net.coding.program.common.ui.GlobalUnit;
+import net.coding.program.message.UsersListFragment_;
+import net.coding.program.project.ProjectFragment_;
+import net.coding.program.setting.MainSettingFragment_;
+import net.coding.program.task.TaskFragment_;
+
+import org.androidannotations.annotations.AfterViews;
+import org.androidannotations.annotations.EActivity;
+
+import java.util.List;
+
+@EActivity(R.layout.activity_main_parent)
+public class EnterpriseMainActivity extends MainActivity {
+
+ @AfterViews
+ void initEnterpriseMainActivity() {
+ }
+
+ @Override
+ protected OnTabSelectListener getBottomBarListener() {
+ return tabId -> {
+ int[] tabs = new int[]{
+ R.id.tabProject,
+ R.id.tabTask,
+ R.id.tabMessage,
+ R.id.tabMy
+ };
+
+ for (int i = 0; i < tabs.length; ++i) {
+ if (tabs[i] == tabId) {
+ onNavigationDrawerItemSelected(i);
+ }
+ }
+ };
+ }
+
+ // todo 切换保存状态
+ public void onNavigationDrawerItemSelected(int position) {
+ mSelectPos = position;
+ Fragment fragment = null;
+
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+ actionBarCompShadow.setVisibility(View.VISIBLE);
+ } else {
+ ViewCompat.setElevation(appbar, GlobalUnit.ACTIONBAR_SHADOW);
+ }
+
+ taskOper(position);
+ updateNotifyFromService();
+ switch (position) {
+ case 0://防止重复加载数据
+// fragment = new ProjectFragment_();
+ List fragments = getSupportFragmentManager().getFragments();
+ boolean containFragment = false;
+ if (fragments != null) {
+ for (Fragment item : fragments) {
+ if (item instanceof ProjectFragment_) {
+ containFragment = true;
+ break;
+ }
+ }
+ }
+
+ if (!containFragment) {
+ fragment = new ProjectFragment_();
+ }
+ toolbarProjectTitle.setText("全部项目");
+ break;
+ case 1:
+// bottomBar.getTabWithId(R.id.tabProject).setBadgeCount(20);
+ fragment = new TaskFragment_();
+ break;
+ case 2:
+// bottomBar.getTabWithId(R.id.tabProject).setBadgeCount(300);
+ fragment = new UsersListFragment_();
+ break;
+
+ case 3:
+// bottomBar.getTabWithId(R.id.tabProject).setBadgeCount(0);
+ fragment = new MainSettingFragment_();
+ break;
+ }
+
+ if (position == 0 || position == 1) {
+ if (position == 0) {
+ toolbarProjectTitle.setText("我的项目");
+ }
+ if (position == 1) {
+ toolbarProjectTitle.setText("我的任务");
+ }
+ toolbarProjectTitle.setTag(position);
+ visibleTitle(toolbarProjectTitle);
+ } else {
+ toolbarTitle.setVisibility(View.VISIBLE);
+ visibleTitle(toolbarTitle);
+ }
+
+ if (fragment != null) {
+ getSupportFragmentManager().beginTransaction().replace(R.id.container, fragment).commit();
+ }
+ }
+}
diff --git a/app/src/enterprise/java/net/coding/program/compatible/ClassCompatImp.java b/app/src/enterprise/java/net/coding/program/compatible/ClassCompatImp.java
index a8ac7a06a..4d9b3e61f 100644
--- a/app/src/enterprise/java/net/coding/program/compatible/ClassCompatImp.java
+++ b/app/src/enterprise/java/net/coding/program/compatible/ClassCompatImp.java
@@ -1,6 +1,6 @@
package net.coding.program.compatible;
-import net.coding.program.MainActivity_;
+import net.coding.program.EnterpriseMainActivity_;
/**
* Created by chenchao on 2016/12/28.
@@ -10,6 +10,6 @@ public class ClassCompatImp implements ClassCompatInterface {
@Override
public Class getMainActivity() {
- return MainActivity_.class;
+ return EnterpriseMainActivity_.class;
}
}
diff --git a/app/src/enterprise/res/layout/activity_enterprise_main.xml b/app/src/enterprise/res/layout/activity_enterprise_main.xml
new file mode 100644
index 000000000..06ee65ec6
--- /dev/null
+++ b/app/src/enterprise/res/layout/activity_enterprise_main.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/enterprise/res/values-w820dp/dimens.xml b/app/src/enterprise/res/values-w820dp/dimens.xml
new file mode 100644
index 000000000..63fc81644
--- /dev/null
+++ b/app/src/enterprise/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+
+
+ 64dp
+
diff --git a/app/src/enterprise/res/values/dimens.xml b/app/src/enterprise/res/values/dimens.xml
new file mode 100644
index 000000000..47c822467
--- /dev/null
+++ b/app/src/enterprise/res/values/dimens.xml
@@ -0,0 +1,5 @@
+
+
+ 16dp
+ 16dp
+
diff --git a/app/src/enterprise/res/values/strings.xml b/app/src/enterprise/res/values/strings.xml
new file mode 100644
index 000000000..7abc06d3b
--- /dev/null
+++ b/app/src/enterprise/res/values/strings.xml
@@ -0,0 +1 @@
+
diff --git a/app/src/enterprise/res/xml/bottombar_tabs.xml b/app/src/enterprise/res/xml/bottombar_tabs.xml
new file mode 100644
index 000000000..79f209c9c
--- /dev/null
+++ b/app/src/enterprise/res/xml/bottombar_tabs.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/enterprise/res/xml/bottombar_tabs1.xml b/app/src/enterprise/res/xml/bottombar_tabs1.xml
new file mode 100644
index 000000000..faacfc0a5
--- /dev/null
+++ b/app/src/enterprise/res/xml/bottombar_tabs1.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/net/coding/program/MainActivity.java b/app/src/main/java/net/coding/program/MainActivity.java
index 88a5c7eb1..03749e68d 100755
--- a/app/src/main/java/net/coding/program/MainActivity.java
+++ b/app/src/main/java/net/coding/program/MainActivity.java
@@ -28,6 +28,7 @@
import android.widget.TextView;
import com.roughike.bottombar.BottomBar;
+import com.roughike.bottombar.OnTabSelectListener;
import com.tencent.android.tpush.XGPushManager;
import com.tencent.android.tpush.service.XGPushService;
@@ -307,7 +308,11 @@ public void onNothingSelected(AdapterView parent) {
onNavigationDrawerItemSelected(0);
}
- bottomBar.setOnTabSelectListener(tabId -> {
+ bottomBar.setOnTabSelectListener(getBottomBarListener());
+ }
+
+ protected OnTabSelectListener getBottomBarListener() {
+ return tabId -> {
int[] tabs = new int[]{
R.id.tabProject,
R.id.tabTask,
@@ -321,7 +326,7 @@ public void onNothingSelected(AdapterView parent) {
onNavigationDrawerItemSelected(i);
}
}
- });
+ };
}
public void hideActionBarShadow() {
@@ -494,9 +499,10 @@ protected void onNewIntent(Intent intent) {
/**
* 任务列表特殊处理
* 1.drawerLayout 手势
+ *
* @param position
*/
- private void taskOper(int position) {
+ protected void taskOper(int position) {
isOpenDrawerLayout(position == 1);
}
diff --git a/app/src/main/java/net/coding/program/common/ui/BaseListActivity.java b/app/src/main/java/net/coding/program/common/ui/BaseListActivity.java
index ca125a2f8..45128bdc2 100644
--- a/app/src/main/java/net/coding/program/common/ui/BaseListActivity.java
+++ b/app/src/main/java/net/coding/program/common/ui/BaseListActivity.java
@@ -40,7 +40,7 @@ public abstract class BaseListActivity extends BackActivity implements FootUpdat
public abstract ActivityParam getActivityParam();
-// private static final String TAG_HTTP_BASE_LIST_ACTIVITY = "TAG_HTTP_BASE_LIST_ACTIVITY";
+ // private static final String TAG_HTTP_BASE_LIST_ACTIVITY = "TAG_HTTP_BASE_LIST_ACTIVITY";
private static final String TAG_LOAD_MORE = "TAG_LOAD_MORE";
@Override
@@ -138,11 +138,11 @@ public ActivityParam(String mTitle, String mUrl, Class mViewHold,
}
public interface BaseViewHold {
- public int getLayout();
+ int getLayout();
- public void init(View v, ImageLoadTool imageLoadTool);
+ void init(View v, ImageLoadTool imageLoadTool);
- public void setData(Object data);
+ void setData(Object data);
}
}
diff --git a/app/src/person/AndroidManifest.xml b/app/src/person/AndroidManifest.xml
index c6840924c..ea7d9d502 100755
--- a/app/src/person/AndroidManifest.xml
+++ b/app/src/person/AndroidManifest.xml
@@ -55,8 +55,8 @@
-
-
+
+
@@ -211,12 +211,12 @@
+ android:theme="@style/ActionbarSpannerTheme1"
+ android:windowSoftInputMode="stateAlwaysVisible|adjustUnspecified|stateHidden" />
+ android:windowSoftInputMode="adjustPan|stateAlwaysVisible|adjustUnspecified|stateHidden" />
+
+
+
diff --git a/app/src/person/res/values-w820dp/dimens.xml b/app/src/person/res/values-w820dp/dimens.xml
new file mode 100644
index 000000000..63fc81644
--- /dev/null
+++ b/app/src/person/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+
+
+ 64dp
+
diff --git a/app/src/person/res/values/dimens.xml b/app/src/person/res/values/dimens.xml
new file mode 100644
index 000000000..47c822467
--- /dev/null
+++ b/app/src/person/res/values/dimens.xml
@@ -0,0 +1,5 @@
+
+
+ 16dp
+ 16dp
+
diff --git a/app/src/person/res/values/strings.xml b/app/src/person/res/values/strings.xml
new file mode 100644
index 000000000..7abc06d3b
--- /dev/null
+++ b/app/src/person/res/values/strings.xml
@@ -0,0 +1 @@
+
From 3da90de91976dd5f2780fde473ac6d8ffc0b23b9 Mon Sep 17 00:00:00 2001
From: 8206503 <8206503@qq.com>
Date: Thu, 29 Dec 2016 17:28:19 +0800
Subject: [PATCH 005/898] =?UTF-8?q?Actionbar=20=E7=9A=84=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E7=94=B1=20MainActivity=20=E8=BD=AC=E7=A7=BB=E5=88=B0=20Fragme?=
=?UTF-8?q?nt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/build.gradle | 6 +-
.../program/EnterpriseMainActivity.java | 178 ++++-----
.../java/net/coding/program/MainActivity.java | 378 ++++++++----------
.../program/common/ui/BaseFragment.java | 3 +
.../program/main/MainProjectFragment.java | 30 ++
app/src/main/res/layout/activity_main.xml | 80 ++--
.../main/res/layout/fragment_main_project.xml | 41 ++
7 files changed, 371 insertions(+), 345 deletions(-)
create mode 100644 app/src/main/java/net/coding/program/main/MainProjectFragment.java
create mode 100644 app/src/main/res/layout/fragment_main_project.xml
diff --git a/app/build.gradle b/app/build.gradle
index d26f94a9f..835b46696 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -142,7 +142,6 @@ apt {
// resourcePackageName "$android.defaultConfig.applicationId"
// resourcePackageName 'coding.net.program'
-
// androidManifestFile variant.outputs[0]?.processResources?.manifestFile
// if you have multiple outputs (when using splits), you may want to have other index than 0
@@ -161,5 +160,8 @@ repositories {
}
}
dependencies {
- compile(name:'checknetwork', ext:'aar')
+ compile 'com.android.support:support-v4:23.+'
+}
+dependencies {
+ compile(name: 'checknetwork', ext: 'aar')
}
\ No newline at end of file
diff --git a/app/src/enterprise/java/net/coding/program/EnterpriseMainActivity.java b/app/src/enterprise/java/net/coding/program/EnterpriseMainActivity.java
index 291ce146e..cf854914c 100644
--- a/app/src/enterprise/java/net/coding/program/EnterpriseMainActivity.java
+++ b/app/src/enterprise/java/net/coding/program/EnterpriseMainActivity.java
@@ -1,23 +1,8 @@
package net.coding.program;
-import android.os.Build;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewCompat;
-import android.view.View;
-
-import com.roughike.bottombar.OnTabSelectListener;
-
-import net.coding.program.common.ui.GlobalUnit;
-import net.coding.program.message.UsersListFragment_;
-import net.coding.program.project.ProjectFragment_;
-import net.coding.program.setting.MainSettingFragment_;
-import net.coding.program.task.TaskFragment_;
-
import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.EActivity;
-import java.util.List;
-
@EActivity(R.layout.activity_main_parent)
public class EnterpriseMainActivity extends MainActivity {
@@ -25,87 +10,84 @@ public class EnterpriseMainActivity extends MainActivity {
void initEnterpriseMainActivity() {
}
- @Override
- protected OnTabSelectListener getBottomBarListener() {
- return tabId -> {
- int[] tabs = new int[]{
- R.id.tabProject,
- R.id.tabTask,
- R.id.tabMessage,
- R.id.tabMy
- };
-
- for (int i = 0; i < tabs.length; ++i) {
- if (tabs[i] == tabId) {
- onNavigationDrawerItemSelected(i);
- }
- }
- };
- }
-
- // todo 切换保存状态
- public void onNavigationDrawerItemSelected(int position) {
- mSelectPos = position;
- Fragment fragment = null;
-
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
- actionBarCompShadow.setVisibility(View.VISIBLE);
- } else {
- ViewCompat.setElevation(appbar, GlobalUnit.ACTIONBAR_SHADOW);
- }
-
- taskOper(position);
- updateNotifyFromService();
- switch (position) {
- case 0://防止重复加载数据
-// fragment = new ProjectFragment_();
- List fragments = getSupportFragmentManager().getFragments();
- boolean containFragment = false;
- if (fragments != null) {
- for (Fragment item : fragments) {
- if (item instanceof ProjectFragment_) {
- containFragment = true;
- break;
- }
- }
- }
-
- if (!containFragment) {
- fragment = new ProjectFragment_();
- }
- toolbarProjectTitle.setText("全部项目");
- break;
- case 1:
-// bottomBar.getTabWithId(R.id.tabProject).setBadgeCount(20);
- fragment = new TaskFragment_();
- break;
- case 2:
-// bottomBar.getTabWithId(R.id.tabProject).setBadgeCount(300);
- fragment = new UsersListFragment_();
- break;
-
- case 3:
-// bottomBar.getTabWithId(R.id.tabProject).setBadgeCount(0);
- fragment = new MainSettingFragment_();
- break;
- }
-
- if (position == 0 || position == 1) {
- if (position == 0) {
- toolbarProjectTitle.setText("我的项目");
- }
- if (position == 1) {
- toolbarProjectTitle.setText("我的任务");
- }
- toolbarProjectTitle.setTag(position);
- visibleTitle(toolbarProjectTitle);
- } else {
- toolbarTitle.setVisibility(View.VISIBLE);
- visibleTitle(toolbarTitle);
- }
-
- if (fragment != null) {
- getSupportFragmentManager().beginTransaction().replace(R.id.container, fragment).commit();
- }
- }
+// @Override
+// protected OnTabSelectListener getBottomBarListener() {
+// return tabId -> {
+// int[] tabs = new int[]{
+// R.id.tabProject,
+// R.id.tabTask,
+// R.id.tabMessage,
+// R.id.tabMy
+// };
+//
+// for (int i = 0; i < tabs.length; ++i) {
+// if (tabs[i] == tabId) {
+// onNavigationDrawerItemSelected(i);
+// }
+// }
+// };
+// }
+
+// // todo 切换保存状态
+// public void onNavigationDrawerItemSelected(int position) {
+// mSelectPos = position;
+// Fragment fragment = null;
+//
+// if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+// actionBarCompShadow.setVisibility(View.VISIBLE);
+// } else {
+// ViewCompat.setElevation(appbar, GlobalUnit.ACTIONBAR_SHADOW);
+// }
+//
+// taskOper(position);
+// updateNotifyFromService();
+// switch (position) {
+// case 0://防止重复加载数据
+//// fragment = new ProjectFragment_();
+// List fragments = getSupportFragmentManager().getFragments();
+// boolean containFragment = false;
+// if (fragments != null) {
+// for (Fragment item : fragments) {
+// if (item instanceof ProjectFragment_) {
+// containFragment = true;
+// break;
+// }
+// }
+// }
+//
+// if (!containFragment) {
+// fragment = new ProjectFragment_();
+// }
+// toolbarProjectTitle.setText("全部项目");
+// break;
+// case 1:
+// fragment = new TaskFragment_();
+// break;
+// case 2:
+// fragment = new UsersListFragment_();
+// break;
+//
+// case 3:
+// fragment = new MainSettingFragment_();
+// break;
+// }
+//
+// if (position == 0 || position == 1) {
+// if (position == 0) {
+// toolbarProjectTitle.setText("我的项目");
+// }
+// if (position == 1) {
+// toolbarProjectTitle.setText("我的任务");
+// }
+// toolbarProjectTitle.setTag(position);
+// visibleTitle(toolbarProjectTitle);
+// } else {
+// toolbarTitle.setVisibility(View.VISIBLE);
+// visibleTitle(toolbarTitle);
+// }
+//
+// if (fragment != null) {
+// getSupportFragmentManager().beginTransaction().replace(R.id.container, fragment).commit();
+// }
+// }
}
diff --git a/app/src/main/java/net/coding/program/MainActivity.java b/app/src/main/java/net/coding/program/MainActivity.java
index 03749e68d..84b6143b7 100755
--- a/app/src/main/java/net/coding/program/MainActivity.java
+++ b/app/src/main/java/net/coding/program/MainActivity.java
@@ -4,27 +4,18 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
-import android.os.Build;
import android.os.Bundle;
-import android.support.design.widget.AppBarLayout;
import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
import android.support.v4.view.GravityCompat;
-import android.support.v4.view.ViewCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.Toolbar;
import android.text.TextUtils;
-import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.AdapterView;
import android.widget.BaseAdapter;
import android.widget.ImageView;
-import android.widget.Spinner;
import android.widget.TextView;
import com.roughike.bottombar.BottomBar;
@@ -40,7 +31,6 @@
import net.coding.program.common.network.MyAsyncHttpClient;
import net.coding.program.common.network.util.Login;
import net.coding.program.common.ui.BaseActivity;
-import net.coding.program.common.ui.GlobalUnit;
import net.coding.program.event.EventFilter;
import net.coding.program.event.EventMessage;
import net.coding.program.event.EventNotifyBottomBar;
@@ -48,12 +38,10 @@
import net.coding.program.event.EventShowBottom;
import net.coding.program.login.MarketingHelp;
import net.coding.program.login.ZhongQiuGuideActivity;
-import net.coding.program.maopao.MaopaoListFragment;
-import net.coding.program.maopao.MaopaoListFragment_;
+import net.coding.program.main.MainProjectFragment_;
import net.coding.program.message.UsersListFragment_;
import net.coding.program.model.AccountInfo;
import net.coding.program.project.ProjectFragment;
-import net.coding.program.project.ProjectFragment_;
import net.coding.program.project.init.InitProUtils;
import net.coding.program.setting.MainSettingFragment_;
import net.coding.program.task.TaskFragment_;
@@ -75,8 +63,6 @@ public class MainActivity extends BaseActivity {
public static final String TAG = "MainActivity";
public static final String BroadcastPushStyle = "BroadcastPushStyle";
- String mTitle;
-
@Extra
String mPushUrl;
@StringArrayRes
@@ -85,13 +71,13 @@ public class MainActivity extends BaseActivity {
String maopao_action_types[];
@ViewById
BottomBar bottomBar;
- @ViewById
- AppBarLayout appbar;
- @ViewById
- View actionBarCompShadow;
-
- TextView toolbarTitle;
- TextView toolbarProjectTitle;
+// @ViewById
+// AppBarLayout appbar;
+// @ViewById
+// View actionBarCompShadow;
+// TextView toolbarTitle;
+// TextView toolbarProjectTitle;
+//private Spinner toolbarMaopaoTitle;
private static boolean sNeedWarnEmailNoValidLogin = false;
@@ -114,7 +100,6 @@ public void onReceive(Context context, Intent intent) {
};
int mSelectPos = 0;
MaopaoTypeAdapter mSpinnerAdapter;
- private Spinner toolbarMaopaoTitle;
private long exitTime = 0;
@Override
@@ -138,8 +123,7 @@ protected void onCreate(Bundle savedInstanceState) {
mFirstEnter = (savedInstanceState == null);
if (savedInstanceState != null) {
- mSelectPos = savedInstanceState.getInt("pos", 0);
- mTitle = savedInstanceState.getString("mTitle");
+ mSelectPos = savedInstanceState.getInt("pos", R.id.tabProject);
}
if (mPushUrl != null) {
@@ -242,70 +226,69 @@ final void initMainActivity() {
startService(intent);
mSpinnerAdapter = new MaopaoTypeAdapter(getLayoutInflater(), maopao_action_types);
-
- Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
- setSupportActionBar(toolbar);
setActionBarTitle("");
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
- actionBarCompShadow.setVisibility(View.VISIBLE);
- } else {
- actionBarCompShadow.setVisibility(View.GONE);
- }
-
- toolbarTitle = (TextView) findViewById(R.id.toolbarTitle);
- toolbarProjectTitle = (TextView) findViewById(R.id.toolbarProjectTitle);
- toolbarProjectTitle.setOnClickListener(clickProjectTitle);
- toolbarMaopaoTitle = (Spinner) findViewById(R.id.toolbarMaopaoTitle);
-
- toolbarMaopaoTitle.setAdapter(mSpinnerAdapter);
- toolbarMaopaoTitle.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
- String[] strings = getResources().getStringArray(R.array.maopao_action_types);
-
- @Override
- public void onItemSelected(AdapterView parent, View view, int position, long id) {
- Fragment fragment;
- Bundle bundle = new Bundle();
- mSpinnerAdapter.setCheckPos(position);
-
- switch (position) {
- case 1:
- fragment = new MaopaoListFragment_();
- bundle.putSerializable("mType", MaopaoListFragment.Type.friends);
- break;
-
- case 2:
- fragment = new MaopaoListFragment_();
- bundle.putSerializable("mType", MaopaoListFragment.Type.hot);
- break;
-
- case 0:
- default:
- fragment = new MaopaoListFragment_();
- bundle.putSerializable("mType", MaopaoListFragment.Type.time);
-
- break;
- }
-
- fragment.setArguments(bundle);
-
- FragmentManager fm = getSupportFragmentManager();
- FragmentTransaction ft = fm.beginTransaction();
- Log.d(TAG, ft == null ? "is null" : "is good");
- ft.replace(R.id.container, fragment, strings[position]);
- ft.commit();
- }
-
- @Override
- public void onNothingSelected(AdapterView parent) {
- }
- });
-
+// Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+// setSupportActionBar(toolbar);
+
+// if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+// actionBarCompShadow.setVisibility(View.VISIBLE);
+// } else {
+// actionBarCompShadow.setVisibility(View.GONE);
+// }
+
+// toolbarTitle = (TextView) findViewById(R.id.toolbarTitle);
+// toolbarProjectTitle = (TextView) findViewById(R.id.toolbarProjectTitle);
+// toolbarProjectTitle.setOnClickListener(clickProjectTitle);
+// toolbarMaopaoTitle = (Spinner) findViewById(R.id.toolbarMaopaoTitle);
+
+// toolbarMaopaoTitle.setAdapter(mSpinnerAdapter);
+// toolbarMaopaoTitle.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+// String[] strings = getResources().getStringArray(R.array.maopao_action_types);
+//
+// @Override
+// public void onItemSelected(AdapterView parent, View view, int position, long id) {
+// Fragment fragment;
+// Bundle bundle = new Bundle();
+// mSpinnerAdapter.setCheckPos(position);
+//
+// switch (position) {
+// case 1:
+// fragment = new MaopaoListFragment_();
+// bundle.putSerializable("mType", MaopaoListFragment.Type.friends);
+// break;
+//
+// case 2:
+// fragment = new MaopaoListFragment_();
+// bundle.putSerializable("mType", MaopaoListFragment.Type.hot);
+// break;
+//
+// case 0:
+// default:
+// fragment = new MaopaoListFragment_();
+// bundle.putSerializable("mType", MaopaoListFragment.Type.time);
+//
+// break;
+// }
+//
+// fragment.setArguments(bundle);
+//
+// FragmentManager fm = getSupportFragmentManager();
+// FragmentTransaction ft = fm.beginTransaction();
+// Log.d(TAG, ft == null ? "is null" : "is good");
+// ft.replace(R.id.container, fragment, strings[position]);
+// ft.commit();
+// }
+//
+// @Override
+// public void onNothingSelected(AdapterView parent) {
+// }
+// });
- mTitle = drawer_title[0];
if (mFirstEnter) {
- onNavigationDrawerItemSelected(0);
+ // todo 打开第一个页面
+// onNavigationDrawerItemSelected(0);
}
bottomBar.setOnTabSelectListener(getBottomBarListener());
@@ -321,155 +304,142 @@ protected OnTabSelectListener getBottomBarListener() {
R.id.tabMy
};
- for (int i = 0; i < tabs.length; ++i) {
- if (tabs[i] == tabId) {
- onNavigationDrawerItemSelected(i);
- }
- }
- };
- }
-
- public void hideActionBarShadow() {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
- if (actionBarCompShadow != null) {
- actionBarCompShadow.setVisibility(View.GONE);
- }
- } else {
- if (appbar != null) {
- ViewCompat.setElevation(appbar, 0);
- }
- }
- }
-
- // todo 切换保存状态
- public void onNavigationDrawerItemSelected(int position) {
- mSelectPos = position;
- Fragment fragment = null;
+ Fragment fragment = null;
+ // android 5.0 以下系统阴影太浓，设置为没有阴影
+// if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+// actionBarCompShadow.setVisibility(View.VISIBLE);
+// } else {
+// ViewCompat.setElevation(appbar, GlobalUnit.ACTIONBAR_SHADOW);
+// }
+
+ taskOper(tabId);
+ updateNotifyFromService();
+ switch (tabId) {
+ case R.id.tabProject://防止重复加载数据
+// fragment = new ProjectFragment_();
+// List fragments = getSupportFragmentManager().getFragments();
+// boolean containFragment = false;
+// if (fragments != null) {
+// for (Fragment item : fragments) {
+// if (item instanceof ProjectFragment_) {
+// containFragment = true;
+// break;
+// }
+// }
+// }
+//
+// if (!containFragment) {
+// fragment = new ProjectFragment_();
+// }
+// toolbarProjectTitle.setText("全部项目");
+//
+// Class cc = MainSettingFragment_.class;
+// getSupportFragmentManager().findFragmentByTag(cc.getName());
+ fragment = new MainProjectFragment_();
+ break;
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
- actionBarCompShadow.setVisibility(View.VISIBLE);
- } else {
- ViewCompat.setElevation(appbar, GlobalUnit.ACTIONBAR_SHADOW);
- }
+ case R.id.tabTask:
+ fragment = new TaskFragment_();
+ break;
- taskOper(position);
- updateNotifyFromService();
- switch (position) {
- case 0://防止重复加载数据
-// fragment = new ProjectFragment_();
- List fragments = getSupportFragmentManager().getFragments();
- boolean containFragment = false;
- if (fragments != null) {
- for (Fragment item : fragments) {
- if (item instanceof ProjectFragment_) {
- containFragment = true;
- break;
- }
- }
- }
+ case R.id.tabMaopao:// 进入冒泡页面，单独处理
+ break;
- if (!containFragment) {
- fragment = new ProjectFragment_();
- }
- toolbarProjectTitle.setText("全部项目");
- break;
- case 1:
-// bottomBar.getTabWithId(R.id.tabProject).setBadgeCount(20);
- fragment = new TaskFragment_();
- break;
- case 2:
- // 进入冒泡页面，单独处理
- break;
-
- case 3:
-// bottomBar.getTabWithId(R.id.tabProject).setBadgeCount(300);
- fragment = new UsersListFragment_();
- break;
-
- case 4:
-// bottomBar.getTabWithId(R.id.tabProject).setBadgeCount(0);
- fragment = new MainSettingFragment_();
- break;
- }
+ case R.id.tabMessage:
+ fragment = new UsersListFragment_();
+ break;
- if (position == 2) {
- List fragments = getSupportFragmentManager().getFragments();
- boolean containFragment = false;
- for (Fragment item : fragments) {
- if (item instanceof MaopaoListFragment) {
- containFragment = true;
+ case R.id.tabMy:
+ fragment = new MainSettingFragment_();
break;
- }
}
- if (!containFragment) {
- int pos = toolbarMaopaoTitle.getSelectedItemPosition();
- toolbarMaopaoTitle.getOnItemSelectedListener().onItemSelected(null, null, pos, pos);
+ if (tabId == R.id.tabMaopao) {
+// List fragments = getSupportFragmentManager().getFragments();
+// boolean containFragment = false;
+// for (Fragment item : fragments) {
+// if (item instanceof MaopaoListFragment) {
+// containFragment = true;
+// break;
+// }
+// }
+//
+// if (!containFragment) {
+// int pos = toolbarMaopaoTitle.getSelectedItemPosition();
+// toolbarMaopaoTitle.getOnItemSelectedListener().onItemSelected(null, null, pos, pos);
+// }
+//
+// visibleTitle(toolbarMaopaoTitle);
+ } else if (tabId == R.id.tabProject) {
+ setTab(tabId, "我的项目");
+ } else if (tabId == R.id.tabTask) {
+ setTab(tabId, "我的任务");
+ } else {
+// toolbarTitle.setVisibility(View.VISIBLE);
+// visibleTitle(toolbarTitle);
}
- visibleTitle(toolbarMaopaoTitle);
- } else if (position == 0 || position == 1) {
- if (position == 0) {
- toolbarProjectTitle.setText("我的项目");
- }
- if (position == 1) {
- toolbarProjectTitle.setText("我的任务");
+ if (fragment != null) {
+ getSupportFragmentManager().beginTransaction().replace(R.id.container, fragment).commit();
}
- toolbarProjectTitle.setTag(position);
- visibleTitle(toolbarProjectTitle);
- } else {
- toolbarTitle.setVisibility(View.VISIBLE);
- visibleTitle(toolbarTitle);
- }
+ };
+ }
- if (fragment != null) {
- getSupportFragmentManager().beginTransaction().replace(R.id.container, fragment).commit();
- }
+ private void setTab(int tabId, String actionName) {
+// toolbarProjectTitle.setText(actionName);
+// toolbarProjectTitle.setTag(tabId);
+// visibleTitle(toolbarProjectTitle);
}
+ public void hideActionBarShadow() {
+// if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+// if (actionBarCompShadow != null) {
+// actionBarCompShadow.setVisibility(View.GONE);
+// }
+// } else {
+// if (appbar != null) {
+// ViewCompat.setElevation(appbar, 0);
+// }
+// }
+ }
void visibleTitle(View title) {
- View[] titles = {
- toolbarTitle,
- toolbarProjectTitle,
- toolbarMaopaoTitle,
- };
-
- for (View item : titles) {
- if (title == item) {
- item.setVisibility(View.VISIBLE);
- } else {
- item.setVisibility(View.GONE);
- }
- }
+// View[] titles = {
+// toolbarTitle,
+// toolbarProjectTitle,
+// toolbarMaopaoTitle,
+// };
+//
+// for (View item : titles) {
+// if (title == item) {
+// item.setVisibility(View.VISIBLE);
+// } else {
+// item.setVisibility(View.GONE);
+// }
+// }
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putInt("pos", mSelectPos);
-// outState.putSerializable("mPushOpened", mPushOpened);
- outState.putString("mTitle", mTitle);
}
@Override
protected void onRestoreInstanceState(Bundle savedInstanceState) {
super.onRestoreInstanceState(savedInstanceState);
mSelectPos = savedInstanceState.getInt("pos", 0);
- mTitle = savedInstanceState.getString("mTitle");
restoreActionBar();
}
public void restoreActionBar() {
- mTitle = drawer_title[mSelectPos];
- if (mSelectPos == 0 || mSelectPos == 1) {
- visibleTitle(toolbarProjectTitle);
- } else if (mSelectPos == 2) {
- visibleTitle(toolbarMaopaoTitle);
- } else {
- visibleTitle(toolbarTitle);
- toolbarTitle.setText(mTitle);
- }
+// if (mSelectPos == R.id.tabProject || mSelectPos == R.id.tabTask) {
+// visibleTitle(toolbarProjectTitle);
+// } else if (mSelectPos == R.id.tabMaopao) {
+// visibleTitle(toolbarMaopaoTitle);
+// } else {
+// visibleTitle(toolbarTitle);
+// }
}
@Override
@@ -503,7 +473,7 @@ protected void onNewIntent(Intent intent) {
* @param position
*/
protected void taskOper(int position) {
- isOpenDrawerLayout(position == 1);
+ isOpenDrawerLayout(position == R.id.tabTask);
}
private void isOpenDrawerLayout(boolean isOpen) {
@@ -620,7 +590,7 @@ public void onEventMainThread(Object object) {
}
} else if (object instanceof EventPosition) {
EventPosition eventPosition = (EventPosition) object;
- toolbarProjectTitle.setText(eventPosition.title);
+// toolbarProjectTitle.setText(eventPosition.title);
} else if (object instanceof EventMessage) {
EventMessage eventMessage = (EventMessage) object;
if (eventMessage.type == EventMessage.Type.loginOut) {
diff --git a/app/src/main/java/net/coding/program/common/ui/BaseFragment.java b/app/src/main/java/net/coding/program/common/ui/BaseFragment.java
index ac2909aaa..b03cc93d5 100755
--- a/app/src/main/java/net/coding/program/common/ui/BaseFragment.java
+++ b/app/src/main/java/net/coding/program/common/ui/BaseFragment.java
@@ -87,6 +87,9 @@ protected ActionBar getActionBar() {
return null;
}
+ protected void setActionBar(String name) {
+ }
+
protected void setActionBarShadow(int dp) {
ActionBar actionBar = getActionBar();
if (actionBar != null) {
diff --git a/app/src/main/java/net/coding/program/main/MainProjectFragment.java b/app/src/main/java/net/coding/program/main/MainProjectFragment.java
new file mode 100644
index 000000000..0a5d2228f
--- /dev/null
+++ b/app/src/main/java/net/coding/program/main/MainProjectFragment.java
@@ -0,0 +1,30 @@
+package net.coding.program.main;
+
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.Toolbar;
+
+import net.coding.program.R;
+import net.coding.program.common.ui.BaseActivity;
+import net.coding.program.common.ui.BaseFragment;
+import net.coding.program.project.ProjectFragment_;
+
+import org.androidannotations.annotations.AfterViews;
+import org.androidannotations.annotations.EFragment;
+import org.androidannotations.annotations.ViewById;
+
+@EFragment(R.layout.fragment_main_project)
+public class MainProjectFragment extends BaseFragment {
+
+ @ViewById
+ Toolbar toolbar;
+
+ @AfterViews
+ void initMainProjectFragment() {
+ ((BaseActivity) getActivity()).setSupportActionBar(toolbar);
+
+ Fragment fragment = new ProjectFragment_();
+ getChildFragmentManager().beginTransaction()
+ .add(R.id.container, fragment)
+ .commit();
+ }
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 54b92ed61..41ab8b1bd 100755
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -13,47 +13,45 @@
android:layout_height="match_parent"
android:orientation="vertical">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 97964b818dbad32771b1f3c9534e2786b17fe7b2 Mon Sep 17 00:00:00 2001
From: 8206503 <8206503@qq.com>
Date: Thu, 29 Dec 2016 18:16:12 +0800
Subject: [PATCH 006/898] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90=20?=
=?UTF-8?q?fragment=20=E8=87=AA=E5=AE=9A=E4=B9=89=20actionbar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/build.gradle | 3 ++
.../java/net/coding/program/MainActivity.java | 6 +--
.../program/common/ui/BaseActivity.java | 2 +-
.../program/message/UsersListFragment.java | 7 +++
.../MainProjectFragment.java | 3 +-
.../program/setting/MainSettingFragment.java | 11 +++++
.../coding/program/task/MainTaskFragment.java | 32 ++++++++++++++
.../net/coding/program/task/TaskFragment.java | 9 ++--
.../main/res/layout/fragment_main_project.xml | 29 +-----------
.../main/res/layout/fragment_main_setting.xml | 2 +
.../main/res/layout/fragment_main_task.xml | 12 +++++
.../main/res/layout/fragment_users_list.xml | 44 +++++++++++--------
.../res/layout/main_message_actionbar.xml | 28 ++++++++++++
.../res/layout/main_project_actionbar.xml | 29 ++++++++++++
14 files changed, 161 insertions(+), 56 deletions(-)
rename app/src/main/java/net/coding/program/{main => project}/MainProjectFragment.java (90%)
create mode 100644 app/src/main/java/net/coding/program/task/MainTaskFragment.java
create mode 100644 app/src/main/res/layout/fragment_main_task.xml
create mode 100644 app/src/main/res/layout/main_message_actionbar.xml
create mode 100644 app/src/main/res/layout/main_project_actionbar.xml
diff --git a/app/build.gradle b/app/build.gradle
index 835b46696..a24e4210a 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -162,6 +162,9 @@ repositories {
dependencies {
compile 'com.android.support:support-v4:23.+'
}
+dependencies {
+ compile 'com.android.support:support-v4:23.+'
+}
dependencies {
compile(name: 'checknetwork', ext: 'aar')
}
\ No newline at end of file
diff --git a/app/src/main/java/net/coding/program/MainActivity.java b/app/src/main/java/net/coding/program/MainActivity.java
index 84b6143b7..f04bc936d 100755
--- a/app/src/main/java/net/coding/program/MainActivity.java
+++ b/app/src/main/java/net/coding/program/MainActivity.java
@@ -38,13 +38,13 @@
import net.coding.program.event.EventShowBottom;
import net.coding.program.login.MarketingHelp;
import net.coding.program.login.ZhongQiuGuideActivity;
-import net.coding.program.main.MainProjectFragment_;
import net.coding.program.message.UsersListFragment_;
import net.coding.program.model.AccountInfo;
+import net.coding.program.project.MainProjectFragment_;
import net.coding.program.project.ProjectFragment;
import net.coding.program.project.init.InitProUtils;
import net.coding.program.setting.MainSettingFragment_;
-import net.coding.program.task.TaskFragment_;
+import net.coding.program.task.MainTaskFragment_;
import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.EActivity;
@@ -339,7 +339,7 @@ protected OnTabSelectListener getBottomBarListener() {
break;
case R.id.tabTask:
- fragment = new TaskFragment_();
+ fragment = new MainTaskFragment_();
break;
case R.id.tabMaopao:// 进入冒泡页面，单独处理
diff --git a/app/src/main/java/net/coding/program/common/ui/BaseActivity.java b/app/src/main/java/net/coding/program/common/ui/BaseActivity.java
index 906fc4eb7..76aee6bea 100755
--- a/app/src/main/java/net/coding/program/common/ui/BaseActivity.java
+++ b/app/src/main/java/net/coding/program/common/ui/BaseActivity.java
@@ -106,7 +106,7 @@ public void showErrorMsg(int code, JSONObject json) {
}
}
- protected void setActionBarTitle(String title) {
+ public void setActionBarTitle(String title) {
ActionBar actionBar = getSupportActionBar();
if (actionBar != null) {
actionBar.setTitle(title);
diff --git a/app/src/main/java/net/coding/program/message/UsersListFragment.java b/app/src/main/java/net/coding/program/message/UsersListFragment.java
index 80f1fd659..574eb0f4b 100755
--- a/app/src/main/java/net/coding/program/message/UsersListFragment.java
+++ b/app/src/main/java/net/coding/program/message/UsersListFragment.java
@@ -4,6 +4,7 @@
import android.app.Activity;
import android.content.DialogInterface;
import android.content.Intent;
+import android.support.v7.widget.Toolbar;
import android.text.Html;
import android.util.Log;
import android.view.View;
@@ -25,6 +26,7 @@
import net.coding.program.common.Unread;
import net.coding.program.common.UnreadNotify;
import net.coding.program.common.network.RefreshBaseFragment;
+import net.coding.program.common.ui.BaseActivity;
import net.coding.program.model.AccountInfo;
import net.coding.program.model.Message;
import net.coding.program.model.UserObject;
@@ -63,6 +65,9 @@ public class UsersListFragment extends RefreshBaseFragment implements FootUpdate
BadgeView badgeAt;
BadgeView badgeComment;
+ @ViewById
+ Toolbar toolbar;
+
// private void postMarkReaded(String globalKey) {
// String url = String.format(HOST_MARK_MESSAGE, globalKey);
// postNetwork(url, new RequestParams(), HOST_MARK_MESSAGE, -1, globalKey);
@@ -149,6 +154,8 @@ private void postMarkReaded(String globalKey) {
@AfterViews
protected void init() {
+ ((BaseActivity) getActivity()).setSupportActionBar(toolbar);
+
initRefreshLayout();
myImageGetter = new MyImageGetter(getActivity());
diff --git a/app/src/main/java/net/coding/program/main/MainProjectFragment.java b/app/src/main/java/net/coding/program/project/MainProjectFragment.java
similarity index 90%
rename from app/src/main/java/net/coding/program/main/MainProjectFragment.java
rename to app/src/main/java/net/coding/program/project/MainProjectFragment.java
index 0a5d2228f..5cd6c90bf 100644
--- a/app/src/main/java/net/coding/program/main/MainProjectFragment.java
+++ b/app/src/main/java/net/coding/program/project/MainProjectFragment.java
@@ -1,4 +1,4 @@
-package net.coding.program.main;
+package net.coding.program.project;
import android.support.v4.app.Fragment;
import android.support.v7.widget.Toolbar;
@@ -6,7 +6,6 @@
import net.coding.program.R;
import net.coding.program.common.ui.BaseActivity;
import net.coding.program.common.ui.BaseFragment;
-import net.coding.program.project.ProjectFragment_;
import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.EFragment;
diff --git a/app/src/main/java/net/coding/program/setting/MainSettingFragment.java b/app/src/main/java/net/coding/program/setting/MainSettingFragment.java
index 980ead8af..b58894a32 100644
--- a/app/src/main/java/net/coding/program/setting/MainSettingFragment.java
+++ b/app/src/main/java/net/coding/program/setting/MainSettingFragment.java
@@ -1,12 +1,14 @@
package net.coding.program.setting;
+import android.support.v7.widget.Toolbar;
import android.widget.ImageView;
import android.widget.TextView;
import net.coding.program.MyApp;
import net.coding.program.R;
import net.coding.program.common.Global;
+import net.coding.program.common.ui.BaseActivity;
import net.coding.program.common.ui.BaseFragment;
import net.coding.program.common.util.PermissionUtil;
import net.coding.program.model.AccountInfo;
@@ -42,8 +44,17 @@ public class MainSettingFragment extends BaseFragment {
@ViewById
ImageView userIcon;
+ @ViewById
+ TextView toolbarTitle;
+
+ @ViewById
+ Toolbar toolbar;
+
@AfterViews
void initMainSettingFragment() {
+ ((BaseActivity) getActivity()).setSupportActionBar(toolbar);
+ toolbarTitle.setText("我的");
+
UserObject me = MyApp.sUserObject;
userName.setText(me.name);
userGK.setText(String.format("个性后缀：%s", me.global_key));
diff --git a/app/src/main/java/net/coding/program/task/MainTaskFragment.java b/app/src/main/java/net/coding/program/task/MainTaskFragment.java
new file mode 100644
index 000000000..6d7b5e925
--- /dev/null
+++ b/app/src/main/java/net/coding/program/task/MainTaskFragment.java
@@ -0,0 +1,32 @@
+package net.coding.program.task;
+
+
+import android.support.v7.widget.Toolbar;
+import android.widget.TextView;
+
+import net.coding.program.R;
+import net.coding.program.common.ui.BaseActivity;
+
+import org.androidannotations.annotations.AfterViews;
+import org.androidannotations.annotations.EFragment;
+import org.androidannotations.annotations.ViewById;
+
+@EFragment(R.layout.fragment_main_task)
+public class MainTaskFragment extends TaskFragment {
+
+ @ViewById
+ TextView toolbarTitle;
+
+ @ViewById
+ Toolbar toolbar;
+
+ @AfterViews
+ void initMainTaskFragment() {
+ BaseActivity activity = (BaseActivity) getActivity();
+ activity.setSupportActionBar(toolbar);
+ activity.setActionBarTitle("");
+ toolbarTitle.setText("我的任务");
+
+ }
+
+}
diff --git a/app/src/main/java/net/coding/program/task/TaskFragment.java b/app/src/main/java/net/coding/program/task/TaskFragment.java
index a3ce66287..711e508ef 100755
--- a/app/src/main/java/net/coding/program/task/TaskFragment.java
+++ b/app/src/main/java/net/coding/program/task/TaskFragment.java
@@ -5,7 +5,6 @@
import android.support.v4.app.Fragment;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
-import android.util.Log;
import android.util.TypedValue;
import android.view.View;
import android.view.ViewGroup;
@@ -57,11 +56,11 @@ public class TaskFragment extends TaskFilterFragment implements TaskListParentUp
final String urlTaskCount = Global.HOST_API + "/tasks/projects/count";
@ViewById
- MyPagerSlidingTabStrip tabs;
+ protected MyPagerSlidingTabStrip tabs;
@ViewById(R.id.pagerTaskFragment)
- ViewPager pager;
+ protected ViewPager pager;
@ViewById
- View actionDivideLine;
+ protected View actionDivideLine;
ArrayList mData = new ArrayList<>();
ArrayList mAllData = new ArrayList<>();
@@ -69,7 +68,7 @@ public class TaskFragment extends TaskFilterFragment implements TaskListParentUp
private PageTaskFragment adapter;
@AfterViews
- void initTaskFragment() {
+ protected void initTaskFragment() {
pageMargin = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 4, getResources()
.getDisplayMetrics());
diff --git a/app/src/main/res/layout/fragment_main_project.xml b/app/src/main/res/layout/fragment_main_project.xml
index 98bb24461..d14be38ee 100644
--- a/app/src/main/res/layout/fragment_main_project.xml
+++ b/app/src/main/res/layout/fragment_main_project.xml
@@ -3,34 +3,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- tools:context="net.coding.program.main.MainProjectFragment">
+ tools:context="net.coding.program.project.MainProjectFragment">
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_users_list.xml b/app/src/main/res/layout/fragment_users_list.xml
index b3798107d..0074a992c 100755
--- a/app/src/main/res/layout/fragment_users_list.xml
+++ b/app/src/main/res/layout/fragment_users_list.xml
@@ -1,29 +1,37 @@
-
+ android:orientation="vertical">
+
-
-
+ android:layout_height="match_parent">
-
+
-
+
+
+
-
\ No newline at end of file
+
+
diff --git a/app/src/main/res/layout/main_message_actionbar.xml b/app/src/main/res/layout/main_message_actionbar.xml
new file mode 100644
index 000000000..bdf27d23a
--- /dev/null
+++ b/app/src/main/res/layout/main_message_actionbar.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/main_project_actionbar.xml b/app/src/main/res/layout/main_project_actionbar.xml
new file mode 100644
index 000000000..e426a95c8
--- /dev/null
+++ b/app/src/main/res/layout/main_project_actionbar.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From d28ad6b15e9c158cf5ce8e7610ba05896439be98 Mon Sep 17 00:00:00 2001
From: 8206503 <8206503@qq.com>
Date: Fri, 30 Dec 2016 09:31:23 +0800
Subject: [PATCH 007/898] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=97=A0=E9=A1=BB?=
=?UTF-8?q?=E7=82=B9=E5=87=BB=E9=A1=B5=E9=9D=A2=E7=9A=84=20title=20?=
=?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../program/common/ui/BaseFragment.java | 18 +++++++
.../program/message/UsersListFragment.java | 48 ++++++-------------
.../program/project/MainProjectFragment.java | 7 +--
.../program/setting/MainSettingFragment.java | 11 +----
.../coding/program/task/MainTaskFragment.java | 17 +------
5 files changed, 36 insertions(+), 65 deletions(-)
diff --git a/app/src/main/java/net/coding/program/common/ui/BaseFragment.java b/app/src/main/java/net/coding/program/common/ui/BaseFragment.java
index b03cc93d5..230743cef 100755
--- a/app/src/main/java/net/coding/program/common/ui/BaseFragment.java
+++ b/app/src/main/java/net/coding/program/common/ui/BaseFragment.java
@@ -8,11 +8,13 @@
import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.ListView;
+import android.widget.TextView;
import com.loopj.android.http.RequestParams;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
@@ -67,6 +69,22 @@ protected void setProgressBarProgress() {
mProgressDialog.setProgress(30);
}
+ protected void setToolbar(String title) {
+ try {
+ View rootLayout = getView();
+ if (rootLayout != null) {
+ Toolbar toolbar = (Toolbar) rootLayout.findViewById(R.id.toolbar);
+ BaseActivity activity = (BaseActivity) getActivity();
+ activity.setSupportActionBar(toolbar);
+ activity.setActionBarTitle("");
+ TextView toolbarTitle = (TextView) toolbar.findViewById(R.id.toolbarTitle);
+ toolbarTitle.setText(title);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
protected void listViewAddHeaderSection(ListView listView) {
View listViewHeader = LayoutInflater.from(getContext()).inflate(R.layout.divide_top_15, listView, false);
listView.addHeaderView(listViewHeader, null, false);
diff --git a/app/src/main/java/net/coding/program/message/UsersListFragment.java b/app/src/main/java/net/coding/program/message/UsersListFragment.java
index 574eb0f4b..2a2d496f9 100755
--- a/app/src/main/java/net/coding/program/message/UsersListFragment.java
+++ b/app/src/main/java/net/coding/program/message/UsersListFragment.java
@@ -2,14 +2,11 @@
import android.app.Activity;
-import android.content.DialogInterface;
import android.content.Intent;
-import android.support.v7.widget.Toolbar;
import android.text.Html;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.AdapterView;
import android.widget.BaseAdapter;
import android.widget.ImageView;
import android.widget.ListView;
@@ -26,7 +23,6 @@
import net.coding.program.common.Unread;
import net.coding.program.common.UnreadNotify;
import net.coding.program.common.network.RefreshBaseFragment;
-import net.coding.program.common.ui.BaseActivity;
import net.coding.program.model.AccountInfo;
import net.coding.program.model.Message;
import net.coding.program.model.UserObject;
@@ -65,21 +61,13 @@ public class UsersListFragment extends RefreshBaseFragment implements FootUpdate
BadgeView badgeAt;
BadgeView badgeComment;
- @ViewById
- Toolbar toolbar;
-
// private void postMarkReaded(String globalKey) {
// String url = String.format(HOST_MARK_MESSAGE, globalKey);
// postNetwork(url, new RequestParams(), HOST_MARK_MESSAGE, -1, globalKey);
// }
BadgeView badgeSystem;
boolean mUpdateAll = false;
- View.OnClickListener onClickRetry = new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- onRefresh();
- }
- };
+
MyImageGetter myImageGetter;
BaseAdapter adapter = new BaseAdapter() {
@Override
@@ -153,8 +141,8 @@ private void postMarkReaded(String globalKey) {
}
@AfterViews
- protected void init() {
- ((BaseActivity) getActivity()).setSupportActionBar(toolbar);
+ protected void initUsersListFragment() {
+ setToolbar("消息");
initRefreshLayout();
@@ -173,24 +161,18 @@ protected void init() {
postMarkReaded(user.friend.global_key);
});
- listView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
- @Override
- public boolean onItemLongClick(AdapterView parent, View view, int position, long id) {
- final Message.MessageObject msg = mData.get((int) id);
- final String format = "删除你和%s之间的所有私信?";
- String title = String.format(format, msg.friend.name);
-
- showDialog("私信", title, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- final String hostDeleteAll = Global.HOST_API + "/message/conversations/%s";
- String url = String.format(hostDeleteAll, msg.friend.id);
- deleteNetwork(url, TAG_DELETE_MESSAGE, msg);
- }
- });
-
- return true;
- }
+ listView.setOnItemLongClickListener((parent, view, position, id) -> {
+ final Message.MessageObject msg = mData.get((int) id);
+ final String format = "删除你和%s之间的所有私信?";
+ String title = String.format(format, msg.friend.name);
+
+ showDialog("私信", title, (dialog, which) -> {
+ final String hostDeleteAll = Global.HOST_API + "/message/conversations/%s";
+ String url = String.format(hostDeleteAll, msg.friend.id);
+ deleteNetwork(url, TAG_DELETE_MESSAGE, msg);
+ });
+
+ return true;
});
initData();
diff --git a/app/src/main/java/net/coding/program/project/MainProjectFragment.java b/app/src/main/java/net/coding/program/project/MainProjectFragment.java
index 5cd6c90bf..bc37a55ba 100644
--- a/app/src/main/java/net/coding/program/project/MainProjectFragment.java
+++ b/app/src/main/java/net/coding/program/project/MainProjectFragment.java
@@ -1,25 +1,20 @@
package net.coding.program.project;
import android.support.v4.app.Fragment;
-import android.support.v7.widget.Toolbar;
import net.coding.program.R;
-import net.coding.program.common.ui.BaseActivity;
import net.coding.program.common.ui.BaseFragment;
import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.EFragment;
-import org.androidannotations.annotations.ViewById;
@EFragment(R.layout.fragment_main_project)
public class MainProjectFragment extends BaseFragment {
- @ViewById
- Toolbar toolbar;
@AfterViews
void initMainProjectFragment() {
- ((BaseActivity) getActivity()).setSupportActionBar(toolbar);
+ setToolbar("我的项目");
Fragment fragment = new ProjectFragment_();
getChildFragmentManager().beginTransaction()
diff --git a/app/src/main/java/net/coding/program/setting/MainSettingFragment.java b/app/src/main/java/net/coding/program/setting/MainSettingFragment.java
index b58894a32..7e3a357d8 100644
--- a/app/src/main/java/net/coding/program/setting/MainSettingFragment.java
+++ b/app/src/main/java/net/coding/program/setting/MainSettingFragment.java
@@ -1,14 +1,12 @@
package net.coding.program.setting;
-import android.support.v7.widget.Toolbar;
import android.widget.ImageView;
import android.widget.TextView;
import net.coding.program.MyApp;
import net.coding.program.R;
import net.coding.program.common.Global;
-import net.coding.program.common.ui.BaseActivity;
import net.coding.program.common.ui.BaseFragment;
import net.coding.program.common.util.PermissionUtil;
import net.coding.program.model.AccountInfo;
@@ -44,16 +42,9 @@ public class MainSettingFragment extends BaseFragment {
@ViewById
ImageView userIcon;
- @ViewById
- TextView toolbarTitle;
-
- @ViewById
- Toolbar toolbar;
-
@AfterViews
void initMainSettingFragment() {
- ((BaseActivity) getActivity()).setSupportActionBar(toolbar);
- toolbarTitle.setText("我的");
+ setToolbar("我的");
UserObject me = MyApp.sUserObject;
userName.setText(me.name);
diff --git a/app/src/main/java/net/coding/program/task/MainTaskFragment.java b/app/src/main/java/net/coding/program/task/MainTaskFragment.java
index 6d7b5e925..c47e0829b 100644
--- a/app/src/main/java/net/coding/program/task/MainTaskFragment.java
+++ b/app/src/main/java/net/coding/program/task/MainTaskFragment.java
@@ -1,32 +1,17 @@
package net.coding.program.task;
-import android.support.v7.widget.Toolbar;
-import android.widget.TextView;
-
import net.coding.program.R;
-import net.coding.program.common.ui.BaseActivity;
import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.EFragment;
-import org.androidannotations.annotations.ViewById;
@EFragment(R.layout.fragment_main_task)
public class MainTaskFragment extends TaskFragment {
- @ViewById
- TextView toolbarTitle;
-
- @ViewById
- Toolbar toolbar;
-
@AfterViews
void initMainTaskFragment() {
- BaseActivity activity = (BaseActivity) getActivity();
- activity.setSupportActionBar(toolbar);
- activity.setActionBarTitle("");
- toolbarTitle.setText("我的任务");
-
+ setToolbar("我的任务");
}
}
From 504646ad460d3b100c6317f0c8e4c7723969c599 Mon Sep 17 00:00:00 2001
From: 8206503 <8206503@qq.com>
Date: Fri, 30 Dec 2016 10:22:16 +0800
Subject: [PATCH 008/898] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20eventbus=20?=
=?UTF-8?q?=E5=88=B0=203.0.0=20=E4=BF=AE=E5=A4=8D=20=E6=88=91=E7=9A=84?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AE=20=E4=B8=8D=E8=83=BD=E7=82=B9=E5=87=BB?=
=?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/build.gradle | 6 +--
.../java/net/coding/program/MainActivity.java | 47 +++++++++----------
.../coding/program/common/UnreadNotify.java | 5 +-
.../maopao/MaopaoListBaseFragment.java | 11 ++---
.../program/project/MainProjectFragment.java | 33 +++++++++++++
.../program/project/MenuProjectFragment.java | 2 +-
.../program/project/ProjectFragment.java | 27 +++++------
.../program/project/ProjectListFragment.java | 24 ++++++----
.../project/detail/TaskFilterFragment.java | 2 +-
.../project/detail/TaskListFragment.java | 26 +++++-----
.../program/setting/SettingFragment.java | 2 +-
.../net/coding/program/task/TaskFragment.java | 17 ++++---
12 files changed, 115 insertions(+), 87 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index a24e4210a..6642b1bbe 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -79,7 +79,7 @@ dependencies {
compile 'com.daimajia.swipelayout:library:1.1.7@aar'
compile 'com.umeng.analytics:analytics:latest.integration'
compile 'com.melnykov:floatingactionbutton:1.3.0'
- compile 'de.greenrobot:eventbus:2.4.0'
+ compile 'org.greenrobot:eventbus:3.0.0'
compile 'pl.droidsonroids.gif:android-gif-drawable:1.1.11'
compile 'com.android.support:support-v13:23.1.1'
compile 'com.ms-square:etsyblur:0.1.0'
@@ -149,8 +149,8 @@ apt {
// resourcePackageName "$android.defaultConfig.applicationId"
resourcePackageName "net.coding.program"
- logLevel "TRACE"
- logAppenderConsole "true"
+// logLevel "TRACE"
+// logAppenderConsole "true"
}
}
diff --git a/app/src/main/java/net/coding/program/MainActivity.java b/app/src/main/java/net/coding/program/MainActivity.java
index f04bc936d..503f1c700 100755
--- a/app/src/main/java/net/coding/program/MainActivity.java
+++ b/app/src/main/java/net/coding/program/MainActivity.java
@@ -31,10 +31,8 @@
import net.coding.program.common.network.MyAsyncHttpClient;
import net.coding.program.common.network.util.Login;
import net.coding.program.common.ui.BaseActivity;
-import net.coding.program.event.EventFilter;
import net.coding.program.event.EventMessage;
import net.coding.program.event.EventNotifyBottomBar;
-import net.coding.program.event.EventPosition;
import net.coding.program.event.EventShowBottom;
import net.coding.program.login.MarketingHelp;
import net.coding.program.login.ZhongQiuGuideActivity;
@@ -51,10 +49,12 @@
import org.androidannotations.annotations.Extra;
import org.androidannotations.annotations.ViewById;
import org.androidannotations.annotations.res.StringArrayRes;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
import java.util.List;
-import de.greenrobot.event.EventBus;
import network.coding.net.checknetwork.CheckNetworkIntentService;
@EActivity(R.layout.activity_main_parent)
@@ -506,10 +506,6 @@ private void exitApp() {
}
}
- private View.OnClickListener clickProjectTitle = v -> {
- EventBus.getDefault().post(new EventFilter(v.getTag()));
- };
-
class MaopaoTypeAdapter extends BaseAdapter {
final int spinnerIcons[] = new int[]{
@@ -578,24 +574,25 @@ public View getDropDownView(int position, View convertView, ViewGroup parent) {
}
}
- public void onEventMainThread(Object object) {
- if (object instanceof EventNotifyBottomBar) {
- updateNotify();
- } else if (object instanceof EventShowBottom) {
- EventShowBottom showBottom = (EventShowBottom) object;
- if (showBottom.showBottom) {
- bottomBar.setVisibility(View.VISIBLE);
- } else {
- bottomBar.setVisibility(View.GONE);
- }
- } else if (object instanceof EventPosition) {
- EventPosition eventPosition = (EventPosition) object;
-// toolbarProjectTitle.setText(eventPosition.title);
- } else if (object instanceof EventMessage) {
- EventMessage eventMessage = (EventMessage) object;
- if (eventMessage.type == EventMessage.Type.loginOut) {
- finish();
- }
+
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onEventBottomBarNotify(EventNotifyBottomBar notify) {
+ updateNotify();
+ }
+
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onEventBottomBar(EventShowBottom showBottom) {
+ if (showBottom.showBottom) {
+ bottomBar.setVisibility(View.VISIBLE);
+ } else {
+ bottomBar.setVisibility(View.GONE);
+ }
+ }
+
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onEventLoginOut(EventMessage eventMessage) {
+ if (eventMessage.type == EventMessage.Type.loginOut) {
+ finish();
}
}
diff --git a/app/src/main/java/net/coding/program/common/UnreadNotify.java b/app/src/main/java/net/coding/program/common/UnreadNotify.java
index 889c5b6ad..baf8eac82 100755
--- a/app/src/main/java/net/coding/program/common/UnreadNotify.java
+++ b/app/src/main/java/net/coding/program/common/UnreadNotify.java
@@ -11,13 +11,14 @@
import net.coding.program.common.network.MyAsyncHttpClient;
import net.coding.program.event.EventNotifyBottomBar;
-import cz.msebera.android.httpclient.Header;
+import org.greenrobot.eventbus.EventBus;
import org.json.JSONObject;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
-import de.greenrobot.event.EventBus;
+import cz.msebera.android.httpclient.Header;
+
/**
* Created by chaochen on 14-9-27.
diff --git a/app/src/main/java/net/coding/program/maopao/MaopaoListBaseFragment.java b/app/src/main/java/net/coding/program/maopao/MaopaoListBaseFragment.java
index d08b76069..84a41b290 100644
--- a/app/src/main/java/net/coding/program/maopao/MaopaoListBaseFragment.java
+++ b/app/src/main/java/net/coding/program/maopao/MaopaoListBaseFragment.java
@@ -60,7 +60,7 @@
import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.EFragment;
import org.androidannotations.annotations.ViewById;
-import cz.msebera.android.httpclient.Header;
+import org.greenrobot.eventbus.EventBus;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -69,7 +69,7 @@
import java.util.Iterator;
import java.util.List;
-import de.greenrobot.event.EventBus;
+import cz.msebera.android.httpclient.Header;
import jp.wasabeef.recyclerview.internal.ViewHelper;
/**
@@ -132,12 +132,7 @@ public abstract class MaopaoListBaseFragment extends BaseFragment implements Sta
protected ArrayList mData = new ArrayList<>();
- View.OnClickListener onClickRetry = new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- onRefresh();
- }
- };
+ View.OnClickListener onClickRetry = v -> onRefresh();
@Override
public void onActivityCreated(Bundle savedInstanceState) {
diff --git a/app/src/main/java/net/coding/program/project/MainProjectFragment.java b/app/src/main/java/net/coding/program/project/MainProjectFragment.java
index bc37a55ba..390428253 100644
--- a/app/src/main/java/net/coding/program/project/MainProjectFragment.java
+++ b/app/src/main/java/net/coding/program/project/MainProjectFragment.java
@@ -1,16 +1,27 @@
package net.coding.program.project;
import android.support.v4.app.Fragment;
+import android.view.View;
+import android.widget.TextView;
import net.coding.program.R;
import net.coding.program.common.ui.BaseFragment;
+import net.coding.program.event.EventFilter;
+import net.coding.program.event.EventPosition;
import org.androidannotations.annotations.AfterViews;
+import org.androidannotations.annotations.Click;
import org.androidannotations.annotations.EFragment;
+import org.androidannotations.annotations.ViewById;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
@EFragment(R.layout.fragment_main_project)
public class MainProjectFragment extends BaseFragment {
+ @ViewById
+ TextView toolbarTitle;
@AfterViews
void initMainProjectFragment() {
@@ -21,4 +32,26 @@ void initMainProjectFragment() {
.add(R.id.container, fragment)
.commit();
}
+
+ @Click
+ void toolbarTitle(View v) {
+ EventBus.getDefault().post(new EventFilter(0));
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
+ EventBus.getDefault().register(this);
+ }
+
+ @Override
+ public void onStop() {
+ super.onStop();
+ EventBus.getDefault().unregister(this);
+ }
+
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onEvent(EventPosition eventPosition) {
+ toolbarTitle.setText(eventPosition.title);
+ }
}
diff --git a/app/src/main/java/net/coding/program/project/MenuProjectFragment.java b/app/src/main/java/net/coding/program/project/MenuProjectFragment.java
index d9172dfbb..0d3188c97 100644
--- a/app/src/main/java/net/coding/program/project/MenuProjectFragment.java
+++ b/app/src/main/java/net/coding/program/project/MenuProjectFragment.java
@@ -13,10 +13,10 @@
import org.androidannotations.annotations.Click;
import org.androidannotations.annotations.EFragment;
import org.androidannotations.annotations.ViewById;
+import org.greenrobot.eventbus.EventBus;
import org.json.JSONException;
import org.json.JSONObject;
-import de.greenrobot.event.EventBus;
/**
* Created by Vernon on 15/11/14.
diff --git a/app/src/main/java/net/coding/program/project/ProjectFragment.java b/app/src/main/java/net/coding/program/project/ProjectFragment.java
index bfe050ef5..652daeec7 100755
--- a/app/src/main/java/net/coding/program/project/ProjectFragment.java
+++ b/app/src/main/java/net/coding/program/project/ProjectFragment.java
@@ -38,6 +38,9 @@
import org.androidannotations.annotations.OnActivityResult;
import org.androidannotations.annotations.OptionsItem;
import org.androidannotations.annotations.ViewById;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -46,8 +49,6 @@
import java.util.ArrayList;
import java.util.List;
-import de.greenrobot.event.EventBus;
-
@EFragment(R.layout.fragment_project)
public class ProjectFragment extends BaseFragment implements ViewPager.OnPageChangeListener,
ProjectListFragment.UpdateData, SwipeRefreshLayout.OnRefreshListener {
@@ -89,21 +90,19 @@ public void onDetach() {
EventBus.getDefault().unregister(this);
}
- // 用于处理推送
- public void onEventMainThread(Object object) {
- if (object instanceof EventFilter) {
- EventFilter eventFilter = (EventFilter) object;
- //确定是我的项目筛选
- if (eventFilter.index == 0) {
- action_filter();
- }
- } else if (object instanceof EventPosition) {
- EventPosition event = (EventPosition) object;
- int position = event.position;
- pager.setCurrentItem(position, false);
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onEvnetFilter(EventFilter eventFilter) {
+ if (eventFilter.index == 0) {
+ action_filter();
}
}
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onEventProject(EventPosition event) {
+ int position = event.position;
+ pager.setCurrentItem(position, false);
+ }
+
@AfterViews
protected void initProjectFragment() {
hideDialogLoading();
diff --git a/app/src/main/java/net/coding/program/project/ProjectListFragment.java b/app/src/main/java/net/coding/program/project/ProjectListFragment.java
index 66d2bf9cb..05f355cfb 100755
--- a/app/src/main/java/net/coding/program/project/ProjectListFragment.java
+++ b/app/src/main/java/net/coding/program/project/ProjectListFragment.java
@@ -1,6 +1,7 @@
package net.coding.program.project;
import android.app.Activity;
+import android.content.Context;
import android.content.Intent;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
@@ -32,12 +33,14 @@
import org.androidannotations.annotations.EFragment;
import org.androidannotations.annotations.FragmentArg;
import org.androidannotations.annotations.ViewById;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.ArrayList;
-import de.greenrobot.event.EventBus;
import se.emilsjolander.stickylistheaders.StickyListHeadersAdapter;
import se.emilsjolander.stickylistheaders.StickyListHeadersListView;
@@ -145,16 +148,9 @@ private void notifyEmputy() {
}
}
- // 用于处理推送
- public void onEventMainThread(EventRefresh event) {
- if (event.refresh) {
- notifyEmputy();
- }
- }
-
@Override
- public void onAttach(Activity activity) {
- super.onAttach(activity);
+ public void onAttach(Context context) {
+ super.onAttach(context);
EventBus.getDefault().register(this);
}
@@ -164,6 +160,14 @@ public void onDetach() {
EventBus.getDefault().unregister(this);
}
+ // 用于处理推送
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onEventRefresh(EventRefresh event) {
+ if (event.refresh) {
+ notifyEmputy();
+ }
+ }
+
@Override
public void onRefresh() {
((SwipeRefreshLayout.OnRefreshListener) getParentFragment()).onRefresh();
diff --git a/app/src/main/java/net/coding/program/project/detail/TaskFilterFragment.java b/app/src/main/java/net/coding/program/project/detail/TaskFilterFragment.java
index 707e69a82..a0b583ae1 100644
--- a/app/src/main/java/net/coding/program/project/detail/TaskFilterFragment.java
+++ b/app/src/main/java/net/coding/program/project/detail/TaskFilterFragment.java
@@ -16,12 +16,12 @@
import net.coding.program.model.TaskLabelModel;
import net.coding.program.model.TaskProjectCountModel;
+import org.greenrobot.eventbus.EventBus;
import org.json.JSONObject;
import java.util.ArrayList;
import java.util.List;
-import de.greenrobot.event.EventBus;
/**
* Created by anfs on 16/12/2016.
diff --git a/app/src/main/java/net/coding/program/project/detail/TaskListFragment.java b/app/src/main/java/net/coding/program/project/detail/TaskListFragment.java
index addb99a34..b257488ed 100755
--- a/app/src/main/java/net/coding/program/project/detail/TaskListFragment.java
+++ b/app/src/main/java/net/coding/program/project/detail/TaskListFragment.java
@@ -40,6 +40,9 @@
import org.androidannotations.annotations.OptionsItem;
import org.androidannotations.annotations.ViewById;
import org.androidannotations.annotations.res.StringArrayRes;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -49,7 +52,6 @@
import java.util.Calendar;
import java.util.WeakHashMap;
-import de.greenrobot.event.EventBus;
import se.emilsjolander.stickylistheaders.StickyListHeadersAdapter;
import se.emilsjolander.stickylistheaders.StickyListHeadersListView;
@@ -645,17 +647,15 @@ public void onDetach() {
}
//筛选后刷新
- public void onEventMainThread(Object object) {
- if (object instanceof EventFilterDetail) {
- EventFilterDetail eventFilter = (EventFilterDetail) object;
- mMeAction = eventFilter.meAction;
- mStatus = eventFilter.status;
- mLabel = eventFilter.label;
- mKeyword = eventFilter.keyword;
-
- //重新加载所有
- mUpdateAll = true;
- initUrlAndLoadData();
- }
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onEvent(EventFilterDetail eventFilter) {
+ mMeAction = eventFilter.meAction;
+ mStatus = eventFilter.status;
+ mLabel = eventFilter.label;
+ mKeyword = eventFilter.keyword;
+
+ //重新加载所有
+ mUpdateAll = true;
+ initUrlAndLoadData();
}
}
diff --git a/app/src/main/java/net/coding/program/setting/SettingFragment.java b/app/src/main/java/net/coding/program/setting/SettingFragment.java
index 0451c3361..6ca8d6267 100755
--- a/app/src/main/java/net/coding/program/setting/SettingFragment.java
+++ b/app/src/main/java/net/coding/program/setting/SettingFragment.java
@@ -29,11 +29,11 @@
import org.androidannotations.annotations.EFragment;
import org.androidannotations.annotations.UiThread;
import org.androidannotations.annotations.ViewById;
+import org.greenrobot.eventbus.EventBus;
import java.io.File;
import java.util.regex.Pattern;
-import de.greenrobot.event.EventBus;
@EFragment(R.layout.fragment_setting)
public class SettingFragment extends BaseFragment {
diff --git a/app/src/main/java/net/coding/program/task/TaskFragment.java b/app/src/main/java/net/coding/program/task/TaskFragment.java
index 711e508ef..1bab14a6c 100755
--- a/app/src/main/java/net/coding/program/task/TaskFragment.java
+++ b/app/src/main/java/net/coding/program/task/TaskFragment.java
@@ -1,6 +1,7 @@
package net.coding.program.task;
import android.app.Activity;
+import android.content.Context;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.view.PagerAdapter;
@@ -36,6 +37,9 @@
import org.androidannotations.annotations.OptionsItem;
import org.androidannotations.annotations.OptionsMenu;
import org.androidannotations.annotations.ViewById;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -45,8 +49,6 @@
import java.util.Collections;
import java.util.List;
-import de.greenrobot.event.EventBus;
-
@EFragment(R.layout.fragment_task)
@OptionsMenu(R.menu.fragment_task)
@@ -377,8 +379,8 @@ public Fragment getItem(int position) {
}
@Override
- public void onAttach(Activity activity) {
- super.onAttach(activity);
+ public void onAttach(Context context) {
+ super.onAttach(context);
EventBus.getDefault().register(this);
}
@@ -389,11 +391,8 @@ public void onDetach() {
}
// 用于处理推送
- public void onEventMainThread(Object object) {
- if (!(object instanceof EventFilter)) {
- return;
- }
- EventFilter eventFilter = (EventFilter) object;
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onEventMainThread(EventFilter eventFilter) {
//确定是我的任务筛选
if (eventFilter.index == 1) {
meActionFilter();
From 37943c1c80d748aa1dde82f47375f965e93995b3 Mon Sep 17 00:00:00 2001
From: 8206503 <8206503@qq.com>
Date: Fri, 30 Dec 2016 10:42:59 +0800
Subject: [PATCH 009/898] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=20=E6=A0=87=E9=A2=98=E6=A0=8F=E4=B8=8D=E8=83=BD=E7=82=B9?=
=?UTF-8?q?=E5=87=BB=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../project/detail/TaskFilterFragment.java | 2 +-
.../coding/program/task/MainTaskFragment.java | 22 +++++++++++++++++++
app/src/main/res/values/colors.xml | 4 ++--
3 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/net/coding/program/project/detail/TaskFilterFragment.java b/app/src/main/java/net/coding/program/project/detail/TaskFilterFragment.java
index a0b583ae1..074e9f0bf 100644
--- a/app/src/main/java/net/coding/program/project/detail/TaskFilterFragment.java
+++ b/app/src/main/java/net/coding/program/project/detail/TaskFilterFragment.java
@@ -77,7 +77,7 @@ protected String getRole() {
}
protected void initFilterViews() {
- toolBarTitle = (TextView) getActivity().findViewById(R.id.toolbarProjectTitle);
+ toolBarTitle = (TextView) getActivity().findViewById(R.id.toolbarTitle);
}
// 用于处理推送
diff --git a/app/src/main/java/net/coding/program/task/MainTaskFragment.java b/app/src/main/java/net/coding/program/task/MainTaskFragment.java
index c47e0829b..56d194838 100644
--- a/app/src/main/java/net/coding/program/task/MainTaskFragment.java
+++ b/app/src/main/java/net/coding/program/task/MainTaskFragment.java
@@ -1,17 +1,39 @@
package net.coding.program.task;
+import android.view.View;
+import android.widget.TextView;
+
import net.coding.program.R;
+import net.coding.program.event.EventFilter;
+import net.coding.program.event.EventPosition;
import org.androidannotations.annotations.AfterViews;
+import org.androidannotations.annotations.Click;
import org.androidannotations.annotations.EFragment;
+import org.androidannotations.annotations.ViewById;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
@EFragment(R.layout.fragment_main_task)
public class MainTaskFragment extends TaskFragment {
+ @ViewById
+ TextView toolbarTitle;
+
@AfterViews
void initMainTaskFragment() {
setToolbar("我的任务");
}
+ @Click
+ void toolbarTitle(View v) {
+ EventBus.getDefault().post(new EventFilter(1));
+ }
+
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onEvent(EventPosition eventPosition) {
+ toolbarTitle.setText(eventPosition.title);
+ }
}
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 2a7e2d314..db1fbdb14 100755
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,10 +3,10 @@
- #FF3BBD79
- #FF323A45
- #FFF8F8F8
- - #000000
+ - #222222
- #494E57
- #FFF8F8F8
- - #000000
+ - #222222
- #494E57
- #F8F8F8
From 11018c15221d7dab3e051b87bcda9db438a645ac Mon Sep 17 00:00:00 2001
From: 8206503 <8206503@qq.com>
Date: Tue, 3 Jan 2017 09:49:48 +0800
Subject: [PATCH 010/898] =?UTF-8?q?=E5=85=BC=E5=AE=B9=204.4=20=E9=98=B4?=
=?UTF-8?q?=E5=BD=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/net/coding/program/MainActivity.java | 85 +++----------------
.../program/common/ui/BaseFragment.java | 29 +++++--
.../coding/program/task/MainTaskFragment.java | 21 +++++
.../net/coding/program/task/TaskFragment.java | 10 +--
app/src/main/res/layout/actionbar_shadow.xml | 9 ++
app/src/main/res/layout/activity_main.xml | 7 +-
.../main/res/layout/fragment_main_project.xml | 13 ++-
.../main/res/layout/fragment_main_setting.xml | 80 +++++++++--------
.../main/res/layout/fragment_main_task.xml | 11 ++-
.../main/res/layout/fragment_users_list.xml | 2 +
.../res/layout/main_message_actionbar.xml | 2 +-
.../res/layout/main_project_actionbar.xml | 2 +-
12 files changed, 133 insertions(+), 138 deletions(-)
create mode 100644 app/src/main/res/layout/actionbar_shadow.xml
diff --git a/app/src/main/java/net/coding/program/MainActivity.java b/app/src/main/java/net/coding/program/MainActivity.java
index 503f1c700..3922c91ca 100755
--- a/app/src/main/java/net/coding/program/MainActivity.java
+++ b/app/src/main/java/net/coding/program/MainActivity.java
@@ -6,12 +6,13 @@
import android.content.IntentFilter;
import android.os.Bundle;
import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.AlertDialog;
import android.text.TextUtils;
import android.view.LayoutInflater;
-import android.view.Menu;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
@@ -316,25 +317,6 @@ protected OnTabSelectListener getBottomBarListener() {
updateNotifyFromService();
switch (tabId) {
case R.id.tabProject://防止重复加载数据
-// fragment = new ProjectFragment_();
-// List fragments = getSupportFragmentManager().getFragments();
-// boolean containFragment = false;
-// if (fragments != null) {
-// for (Fragment item : fragments) {
-// if (item instanceof ProjectFragment_) {
-// containFragment = true;
-// break;
-// }
-// }
-// }
-//
-// if (!containFragment) {
-// fragment = new ProjectFragment_();
-// }
-// toolbarProjectTitle.setText("全部项目");
-//
-// Class cc = MainSettingFragment_.class;
-// getSupportFragmentManager().findFragmentByTag(cc.getName());
fragment = new MainProjectFragment_();
break;
@@ -343,6 +325,7 @@ protected OnTabSelectListener getBottomBarListener() {
break;
case R.id.tabMaopao:// 进入冒泡页面，单独处理
+ // todo
break;
case R.id.tabMessage:
@@ -369,14 +352,6 @@ protected OnTabSelectListener getBottomBarListener() {
// toolbarMaopaoTitle.getOnItemSelectedListener().onItemSelected(null, null, pos, pos);
// }
//
-// visibleTitle(toolbarMaopaoTitle);
- } else if (tabId == R.id.tabProject) {
- setTab(tabId, "我的项目");
- } else if (tabId == R.id.tabTask) {
- setTab(tabId, "我的任务");
- } else {
-// toolbarTitle.setVisibility(View.VISIBLE);
-// visibleTitle(toolbarTitle);
}
if (fragment != null) {
@@ -385,38 +360,15 @@ protected OnTabSelectListener getBottomBarListener() {
};
}
- private void setTab(int tabId, String actionName) {
-// toolbarProjectTitle.setText(actionName);
-// toolbarProjectTitle.setTag(tabId);
-// visibleTitle(toolbarProjectTitle);
- }
+ protected void switchFragment(Class c) {
+ FragmentManager manager = getSupportFragmentManager();
+ FragmentTransaction transaction = manager.beginTransaction();
- public void hideActionBarShadow() {
-// if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-// if (actionBarCompShadow != null) {
-// actionBarCompShadow.setVisibility(View.GONE);
-// }
-// } else {
-// if (appbar != null) {
-// ViewCompat.setElevation(appbar, 0);
-// }
-// }
- }
+ Fragment fragment = manager.findFragmentByTag(c.getName());
+ if (fragment == null) {
+
+ }
- void visibleTitle(View title) {
-// View[] titles = {
-// toolbarTitle,
-// toolbarProjectTitle,
-// toolbarMaopaoTitle,
-// };
-//
-// for (View item : titles) {
-// if (title == item) {
-// item.setVisibility(View.VISIBLE);
-// } else {
-// item.setVisibility(View.GONE);
-// }
-// }
}
@Override
@@ -429,23 +381,6 @@ protected void onSaveInstanceState(Bundle outState) {
protected void onRestoreInstanceState(Bundle savedInstanceState) {
super.onRestoreInstanceState(savedInstanceState);
mSelectPos = savedInstanceState.getInt("pos", 0);
- restoreActionBar();
- }
-
- public void restoreActionBar() {
-// if (mSelectPos == R.id.tabProject || mSelectPos == R.id.tabTask) {
-// visibleTitle(toolbarProjectTitle);
-// } else if (mSelectPos == R.id.tabMaopao) {
-// visibleTitle(toolbarMaopaoTitle);
-// } else {
-// visibleTitle(toolbarTitle);
-// }
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- restoreActionBar();
- return super.onCreateOptionsMenu(menu);
}
//当项目设置里删除项目后，重新跳转到主界面，并刷新ProjectFragment
diff --git a/app/src/main/java/net/coding/program/common/ui/BaseFragment.java b/app/src/main/java/net/coding/program/common/ui/BaseFragment.java
index 230743cef..08a5f1867 100755
--- a/app/src/main/java/net/coding/program/common/ui/BaseFragment.java
+++ b/app/src/main/java/net/coding/program/common/ui/BaseFragment.java
@@ -4,7 +4,10 @@
import android.app.ProgressDialog;
import android.content.DialogInterface;
import android.content.Intent;
+import android.os.Build;
import android.os.Bundle;
+import android.support.design.widget.AppBarLayout;
+import android.support.v4.view.ViewCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
@@ -43,16 +46,14 @@ public class BaseFragment extends UmengFragment implements NetworkCallback, Foot
protected NetworkImpl networkImpl;
protected LayoutInflater mInflater;
protected FootUpdate mFootUpdate = new FootUpdate();
- protected View.OnClickListener mOnClickUser = new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- String globalKey = (String) v.getTag();
-
- Intent intent = new Intent(getActivity(), UserDetailActivity_.class);
- intent.putExtra("globalKey", globalKey);
- startActivity(intent);
- }
+
+ protected View.OnClickListener mOnClickUser = v -> {
+ String globalKey = (String) v.getTag();
+ Intent intent = new Intent(getActivity(), UserDetailActivity_.class);
+ intent.putExtra("globalKey", globalKey);
+ startActivity(intent);
};
+
private ImageLoadTool imageLoadTool = new ImageLoadTool();
private ProgressDialog mProgressDialog;
@@ -79,6 +80,16 @@ protected void setToolbar(String title) {
activity.setActionBarTitle("");
TextView toolbarTitle = (TextView) toolbar.findViewById(R.id.toolbarTitle);
toolbarTitle.setText(title);
+
+ View actionBarCompShadow = rootLayout.findViewById(R.id.actionBarCompShadow);
+ AppBarLayout appbarLayout = (AppBarLayout) rootLayout.findViewById(R.id.appbarLayout);
+ // android 5.0 以下系统阴影太浓，设置为没有阴影
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+ actionBarCompShadow.setVisibility(View.VISIBLE);
+ } else {
+ actionBarCompShadow.setVisibility(View.GONE);
+ ViewCompat.setElevation(appbarLayout, GlobalUnit.ACTIONBAR_SHADOW);
+ }
}
} catch (Exception e) {
e.printStackTrace();
diff --git a/app/src/main/java/net/coding/program/task/MainTaskFragment.java b/app/src/main/java/net/coding/program/task/MainTaskFragment.java
index 56d194838..d12fadc80 100644
--- a/app/src/main/java/net/coding/program/task/MainTaskFragment.java
+++ b/app/src/main/java/net/coding/program/task/MainTaskFragment.java
@@ -1,6 +1,9 @@
package net.coding.program.task;
+import android.os.Build;
+import android.support.design.widget.AppBarLayout;
+import android.support.v4.view.ViewCompat;
import android.view.View;
import android.widget.TextView;
@@ -19,6 +22,12 @@
@EFragment(R.layout.fragment_main_task)
public class MainTaskFragment extends TaskFragment {
+ @ViewById
+ AppBarLayout appbarLayout;
+
+ @ViewById
+ View actionBarCompShadow;
+
@ViewById
TextView toolbarTitle;
@@ -36,4 +45,16 @@ void toolbarTitle(View v) {
public void onEvent(EventPosition eventPosition) {
toolbarTitle.setText(eventPosition.title);
}
+
+ public void hideActionBarShadow() {
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+ if (actionBarCompShadow != null) {
+ actionBarCompShadow.setVisibility(View.GONE);
+ }
+ } else {
+ if (appbarLayout != null) {
+ ViewCompat.setElevation(appbarLayout, 0);
+ }
+ }
+ }
}
diff --git a/app/src/main/java/net/coding/program/task/TaskFragment.java b/app/src/main/java/net/coding/program/task/TaskFragment.java
index 1bab14a6c..e855d24e8 100755
--- a/app/src/main/java/net/coding/program/task/TaskFragment.java
+++ b/app/src/main/java/net/coding/program/task/TaskFragment.java
@@ -10,7 +10,6 @@
import android.view.View;
import android.view.ViewGroup;
-import net.coding.program.MainActivity;
import net.coding.program.MyApp;
import net.coding.program.R;
import net.coding.program.common.Global;
@@ -161,6 +160,9 @@ private void initListData() {
}
}
+ public void hideActionBarShadow() {
+ }
+
@Override
public void parseJson(int code, JSONObject respanse, String tag, int pos, Object data) throws JSONException {
postLabelJson(tag, code, respanse);
@@ -184,11 +186,7 @@ public void parseJson(int code, JSONObject respanse, String tag, int pos, Object
actionDivideLine.setVisibility(View.VISIBLE);
tabs.setViewPager(pager);
adapter.notifyDataSetChanged();
-
- Activity activity = getActivity();
- if (activity instanceof MainActivity) {
- ((MainActivity) activity).hideActionBarShadow();
- }
+ hideActionBarShadow();
} else {
showErrorMsg(code, respanse);
diff --git a/app/src/main/res/layout/actionbar_shadow.xml b/app/src/main/res/layout/actionbar_shadow.xml
new file mode 100644
index 000000000..b0a5d49aa
--- /dev/null
+++ b/app/src/main/res/layout/actionbar_shadow.xml
@@ -0,0 +1,9 @@
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 41ab8b1bd..b9a755f88 100755
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -59,17 +59,12 @@
android:layout_height="0dp"
android:layout_weight="1">
-
-
+
diff --git a/app/src/main/res/layout/fragment_main_project.xml b/app/src/main/res/layout/fragment_main_project.xml
index d14be38ee..73caeecd6 100644
--- a/app/src/main/res/layout/fragment_main_project.xml
+++ b/app/src/main/res/layout/fragment_main_project.xml
@@ -8,9 +8,16 @@
+ android:layout_height="0dp"
+ android:layout_weight="1">
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_main_setting.xml b/app/src/main/res/layout/fragment_main_setting.xml
index 4445a4b60..91ed618fe 100644
--- a/app/src/main/res/layout/fragment_main_setting.xml
+++ b/app/src/main/res/layout/fragment_main_setting.xml
@@ -1,22 +1,30 @@
-
+
+
+
+
+
+
+ android:foreground="?attr/selectableItemBackground">
@@ -65,15 +73,15 @@
+ android:layout_height="75dp"
+ android:background="@color/stand_bg">
+ android:layout_weight="1"
+ android:foreground="?attr/selectableItemBackground">
+ android:textSize="20sp" />
+ android:layout_weight="1"
+ android:foreground="?attr/selectableItemBackground">
+ android:textSize="20sp" />
+ app:itemTitle="我的账户" />
+ app:itemTitle="本地文件" />
+ app:itemTitle="帮助和反馈" />
+ app:itemTitle="设置" />
+ app:itemTitle="关于 Coding" />
diff --git a/app/src/main/res/layout/fragment_main_task.xml b/app/src/main/res/layout/fragment_main_task.xml
index 35eb0ec74..91512af3e 100644
--- a/app/src/main/res/layout/fragment_main_task.xml
+++ b/app/src/main/res/layout/fragment_main_task.xml
@@ -7,6 +7,15 @@
-
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_users_list.xml b/app/src/main/res/layout/fragment_users_list.xml
index 0074a992c..d88131af3 100755
--- a/app/src/main/res/layout/fragment_users_list.xml
+++ b/app/src/main/res/layout/fragment_users_list.xml
@@ -33,5 +33,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
+
+
diff --git a/app/src/main/res/layout/main_message_actionbar.xml b/app/src/main/res/layout/main_message_actionbar.xml
index bdf27d23a..f766f6656 100644
--- a/app/src/main/res/layout/main_message_actionbar.xml
+++ b/app/src/main/res/layout/main_message_actionbar.xml
@@ -1,7 +1,7 @@
Date: Tue, 3 Jan 2017 17:47:48 +0800
Subject: [PATCH 011/898] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/build.gradle | 6 +
app/src/enterprise/AndroidManifest.xml | 2 +-
.../program/EnterpriseMainActivity.java | 88 +----
.../program/compatible/ClassCompatImp.java | 6 +
.../project/EnterpriseProjectFragment.java | 312 ++++++++++++++++++
.../layout/fragment_enterprise_project.xml | 43 +++
.../fragment_enterprise_project_empty.xml | 78 +++++
.../res/menu/enterprise_main_project.xml | 44 +++
app/src/enterprise/res/values/strings.xml | 6 +-
app/src/main/AndroidManifest.xml | 2 +-
.../java/net/coding/program/MainActivity.java | 110 +++---
.../ui/shadow/BaseRecyclerViewSpace.java | 52 +++
.../common/ui/shadow/RecyclerViewSpace.java | 72 ++++
.../compatible/ClassCompatInterface.java | 3 +
.../program/compatible/CodingCompat.java | 5 +
.../program/compatible/DefaultCompatImp.java | 6 +
.../program/project/ProjectFragment.java | 3 -
.../main/res/layout/project_list_fragment.xml | 2 +
app/src/main/res/values/dimens.xml | 6 +
app/src/main/res/values/strings.xml | 1 +
20 files changed, 702 insertions(+), 145 deletions(-)
create mode 100644 app/src/enterprise/java/net/coding/program/project/EnterpriseProjectFragment.java
create mode 100644 app/src/enterprise/res/layout/fragment_enterprise_project.xml
create mode 100644 app/src/enterprise/res/layout/fragment_enterprise_project_empty.xml
create mode 100644 app/src/enterprise/res/menu/enterprise_main_project.xml
create mode 100644 app/src/main/java/net/coding/program/common/ui/shadow/BaseRecyclerViewSpace.java
create mode 100644 app/src/main/java/net/coding/program/common/ui/shadow/RecyclerViewSpace.java
diff --git a/app/build.gradle b/app/build.gradle
index 6642b1bbe..3e545370e 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -165,6 +165,12 @@ dependencies {
dependencies {
compile 'com.android.support:support-v4:23.+'
}
+dependencies {
+ compile 'com.android.support:support-v4:23.+'
+}
+dependencies {
+ compile 'com.android.support:support-v4:23.+'
+}
dependencies {
compile(name: 'checknetwork', ext: 'aar')
}
\ No newline at end of file
diff --git a/app/src/enterprise/AndroidManifest.xml b/app/src/enterprise/AndroidManifest.xml
index 2e0044a92..a2f9f5699 100755
--- a/app/src/enterprise/AndroidManifest.xml
+++ b/app/src/enterprise/AndroidManifest.xml
@@ -215,7 +215,7 @@
android:launchMode="singleTask"
android:screenOrientation="portrait"
android:theme="@style/ActionbarSpannerTheme1"
- android:windowSoftInputMode="stateAlwaysVisible|adjustUnspecified|stateHidden" />
+ android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
{
-// int[] tabs = new int[]{
-// R.id.tabProject,
-// R.id.tabTask,
-// R.id.tabMessage,
-// R.id.tabMy
-// };
-//
-// for (int i = 0; i < tabs.length; ++i) {
-// if (tabs[i] == tabId) {
-// onNavigationDrawerItemSelected(i);
-// }
-// }
-// };
-// }
-
-// // todo 切换保存状态
-// public void onNavigationDrawerItemSelected(int position) {
-// mSelectPos = position;
-// Fragment fragment = null;
-//
-// if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-// actionBarCompShadow.setVisibility(View.VISIBLE);
-// } else {
-// ViewCompat.setElevation(appbar, GlobalUnit.ACTIONBAR_SHADOW);
-// }
-//
-// taskOper(position);
-// updateNotifyFromService();
-// switch (position) {
-// case 0://防止重复加载数据
-//// fragment = new ProjectFragment_();
-// List fragments = getSupportFragmentManager().getFragments();
-// boolean containFragment = false;
-// if (fragments != null) {
-// for (Fragment item : fragments) {
-// if (item instanceof ProjectFragment_) {
-// containFragment = true;
-// break;
-// }
-// }
-// }
-//
-// if (!containFragment) {
-// fragment = new ProjectFragment_();
-// }
-// toolbarProjectTitle.setText("全部项目");
-// break;
-// case 1:
-// fragment = new TaskFragment_();
-// break;
-// case 2:
-// fragment = new UsersListFragment_();
-// break;
-//
-// case 3:
-// fragment = new MainSettingFragment_();
-// break;
-// }
-//
-// if (position == 0 || position == 1) {
-// if (position == 0) {
-// toolbarProjectTitle.setText("我的项目");
-// }
-// if (position == 1) {
-// toolbarProjectTitle.setText("我的任务");
-// }
-// toolbarProjectTitle.setTag(position);
-// visibleTitle(toolbarProjectTitle);
-// } else {
-// toolbarTitle.setVisibility(View.VISIBLE);
-// visibleTitle(toolbarTitle);
-// }
-//
-// if (fragment != null) {
-// getSupportFragmentManager().beginTransaction().replace(R.id.container, fragment).commit();
-// }
-// }
+ @Override
+ protected void switchProject() {
+ switchFragment(EnterpriseProjectFragment_.FragmentBuilder_.class);
+ }
}
diff --git a/app/src/enterprise/java/net/coding/program/compatible/ClassCompatImp.java b/app/src/enterprise/java/net/coding/program/compatible/ClassCompatImp.java
index 4d9b3e61f..dbf0827c5 100644
--- a/app/src/enterprise/java/net/coding/program/compatible/ClassCompatImp.java
+++ b/app/src/enterprise/java/net/coding/program/compatible/ClassCompatImp.java
@@ -1,6 +1,7 @@
package net.coding.program.compatible;
import net.coding.program.EnterpriseMainActivity_;
+import net.coding.program.project.EnterpriseProjectFragment_;
/**
* Created by chenchao on 2016/12/28.
@@ -12,4 +13,9 @@ public class ClassCompatImp implements ClassCompatInterface {
public Class getMainActivity() {
return EnterpriseMainActivity_.class;
}
+
+ @Override
+ public Class getMainProjectFragment() {
+ return EnterpriseProjectFragment_.FragmentBuilder_.class;
+ }
}
diff --git a/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectFragment.java b/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectFragment.java
new file mode 100644
index 000000000..874598abf
--- /dev/null
+++ b/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectFragment.java
@@ -0,0 +1,312 @@
+package net.coding.program.project;
+
+
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.loopj.android.http.RequestParams;
+import com.marshalchen.ultimaterecyclerview.UltimateRecyclerView;
+import com.marshalchen.ultimaterecyclerview.UltimateRecyclerviewViewHolder;
+import com.marshalchen.ultimaterecyclerview.quickAdapter.easyRegularAdapter;
+import com.readystatesoftware.viewbadger.BadgeView;
+
+import net.coding.program.R;
+import net.coding.program.common.Global;
+import net.coding.program.common.ImageLoadTool;
+import net.coding.program.common.ui.BaseFragment;
+import net.coding.program.common.ui.shadow.RecyclerViewSpace;
+import net.coding.program.model.AccountInfo;
+import net.coding.program.model.ProjectObject;
+import net.coding.program.project.detail.ProjectActivity;
+import net.coding.program.project.init.InitProUtils;
+
+import org.androidannotations.annotations.AfterViews;
+import org.androidannotations.annotations.EFragment;
+import org.androidannotations.annotations.OnActivityResult;
+import org.androidannotations.annotations.OptionsItem;
+import org.androidannotations.annotations.OptionsMenu;
+import org.androidannotations.annotations.ViewById;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@EFragment(R.layout.fragment_enterprise_project)
+@OptionsMenu(R.menu.enterprise_main_project)
+public class EnterpriseProjectFragment extends BaseFragment {
+
+ final String host = Global.HOST_API + "/projects?pageSize=100&type=all&sort=hot";
+ private static final String URL_PIN_DELETE = Global.HOST_API + "/user/projects/pin?ids=%d";
+ private static final String URL_PIN_SET = Global.HOST_API + "/user/projects/pin";
+
+ int msectionId = 0;
+
+ @ViewById
+ UltimateRecyclerView listView;
+
+ ArrayList listData = new ArrayList<>();
+
+ ProjectAdapter projectAdapter;
+
+ @AfterViews
+ void initEnterpriseProjectFramgent() {
+ setToolbar("我的项目");
+
+ RecyclerView.LayoutManager manager = new LinearLayoutManager(getActivity());
+ listView.setLayoutManager(manager);
+ listView.addItemDecoration(new RecyclerViewSpace(getActivity()));
+ listView.setEmptyView(R.layout.fragment_enterprise_project_empty,
+ R.layout.fragment_enterprise_project_empty);
+
+ listView.setDefaultOnRefreshListener(() -> onRefresh());
+ listView.mSwipeRefreshLayout.setColorSchemeResources(R.color.green);
+ listView.setOnLoadMoreListener((itemsCount, maxLastVisiblePosition) -> loadMore());
+
+// 上拉加载更多
+// mFootUpdate.initToRecycler(listView, mInflater, this);
+// mFootUpdate.showLoading();
+// listView.setLoadMoreView(mFootUpdate.getView());
+
+ projectAdapter = new ProjectAdapter(listData);
+ listView.setAdapter(projectAdapter);
+
+ projectActionUtil = new ProjectActionUtil(getActivity().getBaseContext());
+ projectActionUtil.setListener(pos -> {
+ final int projectId = listData.get(pos).getId();
+ if (listData.get(pos).isPin()) {
+ String pinDeleteUrl = String.format(URL_PIN_DELETE, projectId);
+ deleteNetwork(pinDeleteUrl, URL_PIN_DELETE, -1, projectId);
+ } else {
+ RequestParams params = new RequestParams();
+ params.put("ids", projectId);
+ postNetwork(URL_PIN_SET, params, URL_PIN_SET, -1, projectId);
+ }
+
+ projectActionUtil.close();
+ });
+ onRefresh();
+ }
+
+ private void onRefresh() {
+ getNetwork(host, host);
+ }
+
+ private View.OnClickListener clickItem = v -> {
+ Object object = v.getTag();
+ if (object instanceof ProjectObject) {
+ ProjectObject item = (ProjectObject) object;
+ ProjectActivity.ProjectJumpParam param = new ProjectActivity.ProjectJumpParam(item.project_path);
+ ProjectHomeActivity_.intent(this).mJumpParam(param).startForResult(InitProUtils.REQUEST_PRO_UPDATE);
+ }
+ };
+
+ @OnActivityResult(InitProUtils.REQUEST_PRO_UPDATE)
+ void onResultRefresh() {
+ onRefresh();
+ }
+
+ @Override
+ public void parseJson(int code, JSONObject respanse, String tag, int pos, Object data) throws JSONException {
+ if (tag.equals(host)) {
+ if (code == 0) {
+ listData.clear();
+ JSONArray array = respanse.getJSONObject("data").getJSONArray("list");
+ int pinCount = 0;
+ for (int i = 0; i < array.length(); ++i) {
+ JSONObject item = array.getJSONObject(i);
+ ProjectObject oneData = new ProjectObject(item);
+ if (oneData.isPin()) {
+ listData.add(pinCount++, oneData);
+ } else {
+ listData.add(oneData);
+ }
+ }
+
+ msectionId = 0;
+ for (ProjectObject item : listData) {
+ if (!item.isPin()) {
+ break;
+ }
+ ++msectionId;
+ }
+
+
+ AccountInfo.saveProjects(getActivity(), listData);
+ projectAdapter.notifyDataSetChanged();
+
+ } else {
+ projectAdapter.notifyDataSetChanged();
+ }
+ } else if (tag.equals(URL_PIN_SET)) {
+ if (code == 0) {
+ int id = (int) data;
+ updatePin(id, true);
+ } else {
+ showErrorMsg(code, respanse);
+ }
+
+ } else if (tag.equals(URL_PIN_DELETE)) {
+ if (code == 0) {
+ int id = (int) data;
+ updatePin(id, false);
+ } else {
+ showErrorMsg(code, respanse);
+ }
+ }
+ }
+
+ private void updatePin(int id, boolean pin) {
+ setPin(id, pin);
+ }
+
+ public void setPin(int id, boolean pin) {
+ for (int i = 0; i < listData.size(); ++i) {
+ if (listData.get(i).getId() == id) {
+ listData.get(i).setPin(pin);
+
+ ProjectObject item = listData.remove(i);
+ if (pin) {
+ ++msectionId;
+ listData.add(0, item);
+ } else {
+ --msectionId;
+ listData.add(msectionId, item);
+ }
+ projectAdapter.notifyDataSetChanged();
+ break;
+ }
+ }
+ }
+
+ @Override
+ public void loadMore() {
+ }
+
+ @OptionsItem
+ void actionCreateProject() {
+
+ }
+
+ @OptionsItem
+ void actionCreateTask() {
+
+ }
+
+ @OptionsItem
+ void actionSendMessage() {
+ }
+
+ protected class ProjectAdapter extends easyRegularAdapter {
+
+ public ProjectAdapter(List list) {
+ super(list);
+ }
+
+ @Override
+ protected int getNormalLayoutResId() {
+ return R.layout.project_all_list_item;
+ }
+
+ @Override
+ protected ProjectHolder newViewHolder(View view) {
+ view.setOnClickListener(clickItem);
+ return new ProjectHolder(view);
+ }
+
+ @Override
+ protected void withBindHolder(ProjectHolder holder, ProjectObject data, int position) {
+ ProjectObject item = (ProjectObject) getItem(position);
+
+ holder.privatePin.setVisibility(item.isPin() ? View.VISIBLE : View.INVISIBLE);
+ holder.privateIcon.setVisibility(item.isPublic() ? View.INVISIBLE : View.VISIBLE);
+ String ownerName = item.owner_user_name;
+ holder.content.setText(ownerName);
+ if (!item.isPublic()) {
+ holder.name.setVisibility(View.VISIBLE);
+ holder.name.setText(item.name);
+ holder.name2.setVisibility(View.INVISIBLE);
+ } else {
+ holder.name2.setVisibility(View.VISIBLE);
+ holder.name2.setText(item.name);
+ holder.name.setVisibility(View.INVISIBLE);
+ }
+ holder.desc.setText(item.getDescription());
+ setClickEvent(holder.fLayoutAction, position);
+ int count = item.un_read_activities_count;
+ BadgeView badge = holder.badge;
+ Global.setBadgeView(badge, count);
+
+ holder.fLayoutAction.setVisibility(View.VISIBLE);
+ holder.rootLayout.setTag(item);
+ iconfromNetwork(holder.image, item.icon, ImageLoadTool.optionsRounded2);
+
+ }
+
+ @Override
+ public ProjectHolder newHeaderHolder(View view) {
+ return new ProjectHolder(view, true);
+ }
+
+ @Override
+ public ProjectHolder newFooterHolder(View view) {
+ return new ProjectHolder(view, true);
+ }
+ }
+
+ private ProjectActionUtil projectActionUtil;
+
+ private void setClickEvent(final View fLayoutAction, final int position) {
+ fLayoutAction.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ projectActionUtil.show(fLayoutAction, position);
+ if (!listData.get(position).isPin()) {
+ projectActionUtil.getTxtSetting().setText("设为常用");
+ projectActionUtil.getTxtSetting().setTextColor(getActivity().getResources().getColor(R.color.white));
+ projectActionUtil.getTxtSetting().setBackgroundColor(getActivity().getResources().getColor(R.color.color_3BBD79));
+ } else {
+ projectActionUtil.getTxtSetting().setText("取消常用");
+ projectActionUtil.getTxtSetting().setTextColor(getActivity().getResources().getColor(R.color.color_3BBD79));
+ projectActionUtil.getTxtSetting().setBackgroundColor(getActivity().getResources().getColor(R.color.color_E5E5E5));
+ }
+ }
+ });
+ }
+
+ class ProjectHolder extends UltimateRecyclerviewViewHolder {
+
+ TextView name;
+ ImageView image;
+ TextView name2;
+ TextView content;
+ TextView desc;
+ BadgeView badge;
+ View privateIcon;
+ ImageView privatePin;
+ View fLayoutAction;
+ View rootLayout;
+
+ ProjectHolder(View view, boolean isHeader) {
+ super(view);
+ }
+
+ public ProjectHolder(View view) {
+ super(view);
+ rootLayout = view;
+ name = (TextView) view.findViewById(R.id.name);
+ image = (ImageView) view.findViewById(R.id.icon);
+ content = (TextView) view.findViewById(R.id.comment);
+ badge = (BadgeView) view.findViewById(R.id.badge);
+ privateIcon = view.findViewById(R.id.privateIcon);
+ fLayoutAction = view.findViewById(R.id.flayoutAction);
+ desc = (TextView) view.findViewById(R.id.txtDesc);
+ privatePin = (ImageView) view.findViewById(R.id.privatePin);
+ name2 = (TextView) view.findViewById(R.id.name2);
+ }
+ }
+}
diff --git a/app/src/enterprise/res/layout/fragment_enterprise_project.xml b/app/src/enterprise/res/layout/fragment_enterprise_project.xml
new file mode 100644
index 000000000..388c9141e
--- /dev/null
+++ b/app/src/enterprise/res/layout/fragment_enterprise_project.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/enterprise/res/layout/fragment_enterprise_project_empty.xml b/app/src/enterprise/res/layout/fragment_enterprise_project_empty.xml
new file mode 100644
index 000000000..23a06f066
--- /dev/null
+++ b/app/src/enterprise/res/layout/fragment_enterprise_project_empty.xml
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/enterprise/res/menu/enterprise_main_project.xml b/app/src/enterprise/res/menu/enterprise_main_project.xml
new file mode 100644
index 000000000..dd05ec58c
--- /dev/null
+++ b/app/src/enterprise/res/menu/enterprise_main_project.xml
@@ -0,0 +1,44 @@
+
+
diff --git a/app/src/enterprise/res/values/strings.xml b/app/src/enterprise/res/values/strings.xml
index 7abc06d3b..fd4435b08 100644
--- a/app/src/enterprise/res/values/strings.xml
+++ b/app/src/enterprise/res/values/strings.xml
@@ -1 +1,5 @@
-
+
+
+
+ 再按一次退出Coding企业版
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5fa4a3dd6..ae6a7dd74 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -213,7 +213,7 @@
android:launchMode="singleTask"
android:screenOrientation="portrait"
android:configChanges="orientation|keyboardHidden"
- android:windowSoftInputMode="stateAlwaysVisible|adjustUnspecified|stateHidden"
+ android:windowSoftInputMode="stateAlwaysHidden|adjustResize"
android:theme="@style/ActionbarSpannerTheme1" />
switchTab(tabId));
}
- protected OnTabSelectListener getBottomBarListener() {
- return tabId -> {
- int[] tabs = new int[]{
- R.id.tabProject,
- R.id.tabTask,
- R.id.tabMaopao,
- R.id.tabMessage,
- R.id.tabMy
- };
-
- Fragment fragment = null;
- // android 5.0 以下系统阴影太浓，设置为没有阴影
-// if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-// actionBarCompShadow.setVisibility(View.VISIBLE);
-// } else {
-// ViewCompat.setElevation(appbar, GlobalUnit.ACTIONBAR_SHADOW);
-// }
-
- taskOper(tabId);
- updateNotifyFromService();
- switch (tabId) {
- case R.id.tabProject://防止重复加载数据
- fragment = new MainProjectFragment_();
- break;
-
- case R.id.tabTask:
- fragment = new MainTaskFragment_();
- break;
-
- case R.id.tabMaopao:// 进入冒泡页面，单独处理
- // todo
- break;
+ protected void switchTab(int tabId) {
+ taskOper(tabId);
+ updateNotifyFromService();
+ switch (tabId) {
+ case R.id.tabProject:
+ switchProject();
+ break;
- case R.id.tabMessage:
- fragment = new UsersListFragment_();
- break;
+ case R.id.tabTask:
+ switchFragment(MainTaskFragment_.FragmentBuilder_.class);
+ break;
- case R.id.tabMy:
- fragment = new MainSettingFragment_();
- break;
- }
-
- if (tabId == R.id.tabMaopao) {
+ case R.id.tabMaopao:// 进入冒泡页面，单独处理
+ // todo
// List fragments = getSupportFragmentManager().getFragments();
// boolean containFragment = false;
// for (Fragment item : fragments) {
@@ -351,24 +321,49 @@ protected OnTabSelectListener getBottomBarListener() {
// int pos = toolbarMaopaoTitle.getSelectedItemPosition();
// toolbarMaopaoTitle.getOnItemSelectedListener().onItemSelected(null, null, pos, pos);
// }
-//
- }
+ break;
- if (fragment != null) {
- getSupportFragmentManager().beginTransaction().replace(R.id.container, fragment).commit();
- }
- };
+ case R.id.tabMessage:
+ switchFragment(UsersListFragment_.FragmentBuilder_.class);
+ break;
+
+ case R.id.tabMy:
+ switchFragment(MainSettingFragment_.FragmentBuilder_.class);
+ break;
+ }
}
- protected void switchFragment(Class c) {
- FragmentManager manager = getSupportFragmentManager();
- FragmentTransaction transaction = manager.beginTransaction();
+ protected void switchProject() {
+ switchFragment(MainProjectFragment_.FragmentBuilder_.class);
+ }
+
+
+ final protected void switchFragment(Class cls) {
+ String tag = cls.getName();
+ Fragment showFragment = getSupportFragmentManager().findFragmentByTag(tag);
- Fragment fragment = manager.findFragmentByTag(c.getName());
- if (fragment == null) {
-
+ FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
+ if (showFragment == null) {
+ try {
+ showFragment = (Fragment) ((FragmentBuilder) cls.newInstance()).build();
+ fragmentTransaction.add(R.id.container, showFragment, tag);
+ } catch (Exception e) {
+ Global.errorLog(e);
+ }
+ } else {
+ fragmentTransaction.show(showFragment);
}
+ List allFragments = getSupportFragmentManager().getFragments();
+ if (allFragments != null) {
+ for (Fragment item : allFragments) {
+ if (item != showFragment) {
+ fragmentTransaction.hide(item);
+ }
+ }
+ }
+
+ fragmentTransaction.commit();
}
@Override
@@ -432,9 +427,8 @@ public void onBackPressed() {
}
private void exitApp() {
-
if ((System.currentTimeMillis() - exitTime) > 2000) {
- showButtomToast("再按一次退出Coding");
+ showButtomToast(R.string.exit_app);
exitTime = System.currentTimeMillis();
} else {
finish();
diff --git a/app/src/main/java/net/coding/program/common/ui/shadow/BaseRecyclerViewSpace.java b/app/src/main/java/net/coding/program/common/ui/shadow/BaseRecyclerViewSpace.java
new file mode 100644
index 000000000..cccf3b712
--- /dev/null
+++ b/app/src/main/java/net/coding/program/common/ui/shadow/BaseRecyclerViewSpace.java
@@ -0,0 +1,52 @@
+package net.coding.program.common.ui.shadow;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Paint;
+import android.graphics.drawable.Drawable;
+import android.support.v7.widget.RecyclerView;
+
+import net.coding.program.R;
+import net.coding.program.common.Global;
+
+
+/**
+ * Created by chenchao on 16/4/20.
+ */
+public class BaseRecyclerViewSpace extends RecyclerView.ItemDecoration {
+
+ public final int DIVIDE_COLOR;
+ public final int DIVIDE_LINE_COLOR;
+
+ protected final int topSpace;
+ protected final int lineSpace;
+ protected int bottomSpace;
+ protected final int bottomShadowSpace;
+ protected final int shadowHigh;
+
+ protected Paint paintDivideLine;
+ protected Drawable shadowTop;
+ protected Drawable shadowBottom;
+ protected Paint paintDivide;
+
+ public BaseRecyclerViewSpace(Context context) {
+ Resources resources = context.getResources();
+ topSpace = resources.getDimensionPixelSize(R.dimen.list_header_space);
+ lineSpace = resources.getDimensionPixelSize(R.dimen.list_divide_line_height);
+ bottomSpace = resources.getDimensionPixelSize(R.dimen.list_footer_space);
+ bottomShadowSpace = resources.getDimensionPixelSize(R.dimen.list_footer_shadow_space);
+
+ DIVIDE_COLOR = resources.getColor(R.color.divide);
+ DIVIDE_LINE_COLOR = resources.getColor(R.color.divide_line);
+
+ paintDivideLine = new Paint();
+ paintDivideLine.setColor(DIVIDE_LINE_COLOR);
+
+ paintDivide = new Paint();
+ paintDivide.setColor(DIVIDE_COLOR);
+
+ shadowTop = resources.getDrawable(R.mipmap.shadow_top);
+ shadowBottom = resources.getDrawable(R.mipmap.shadow_bottom);
+ shadowHigh = Global.dpToPx(5);
+ }
+}
diff --git a/app/src/main/java/net/coding/program/common/ui/shadow/RecyclerViewSpace.java b/app/src/main/java/net/coding/program/common/ui/shadow/RecyclerViewSpace.java
new file mode 100644
index 000000000..52e911892
--- /dev/null
+++ b/app/src/main/java/net/coding/program/common/ui/shadow/RecyclerViewSpace.java
@@ -0,0 +1,72 @@
+package net.coding.program.common.ui.shadow;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+import net.coding.program.common.Global;
+
+/**
+ * Created by chenchao on 16/3/4.
+ */
+public class RecyclerViewSpace extends BaseRecyclerViewSpace {
+
+ private int leftSapce;
+
+ public RecyclerViewSpace(Context context) {
+ super(context);
+ leftSapce = Global.dpToPx(15);
+ }
+
+ @Override
+ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+ int pos = parent.getChildAdapterPosition(view);
+ if (pos == 0) {
+ outRect.top = topSpace;
+ outRect.bottom = lineSpace;
+ }
+
+ if (pos == parent.getAdapter().getItemCount() - 1) {
+ outRect.bottom = bottomSpace;
+ } else {
+ outRect.bottom = lineSpace;
+ }
+ }
+
+ @Override
+ public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {
+ super.onDraw(c, parent, state);
+
+ final int childCount = parent.getChildCount();
+ for (int i = 0; i < childCount; ++i) {
+ View view = parent.getChildAt(i);
+ int pos = parent.getChildAdapterPosition(view);
+ if (pos == 0) {
+ Rect rectTop = new Rect(view.getLeft(), view.getTop() - topSpace, view.getRight(), view.getTop());
+ c.drawRect(rectTop, paintDivide);
+
+ Rect rectShadow = new Rect(rectTop);
+ rectShadow.top = rectShadow.bottom - shadowHigh;
+ shadowTop.setBounds(rectShadow);
+ shadowTop.draw(c);
+ }
+
+ if (pos == parent.getAdapter().getItemCount() - 1) {
+ Rect rect = new Rect(view.getLeft(), view.getBottom() , view.getRight(), view.getBottom() + bottomSpace);
+ c.drawRect(rect, paintDivide);
+
+ Rect rectShadow = new Rect(rect);
+ rectShadow.bottom = view.getTop() + shadowHigh;
+ shadowBottom.setBounds(rectShadow);
+ shadowBottom.draw(c);
+ } else {
+ Rect rectDivideLine = new Rect(view.getLeft(), view.getBottom(), view.getRight(), view.getBottom() + lineSpace);
+ c.drawRect(rectDivideLine, paintDivideLine);
+ }
+
+ }
+
+ }
+}
diff --git a/app/src/main/java/net/coding/program/compatible/ClassCompatInterface.java b/app/src/main/java/net/coding/program/compatible/ClassCompatInterface.java
index 53e9b87be..82e4c7bcc 100644
--- a/app/src/main/java/net/coding/program/compatible/ClassCompatInterface.java
+++ b/app/src/main/java/net/coding/program/compatible/ClassCompatInterface.java
@@ -7,4 +7,7 @@
public interface ClassCompatInterface {
Class getMainActivity();
+
+ Class getMainProjectFragment();
+
}
diff --git a/app/src/main/java/net/coding/program/compatible/CodingCompat.java b/app/src/main/java/net/coding/program/compatible/CodingCompat.java
index 41aafe881..21850c969 100644
--- a/app/src/main/java/net/coding/program/compatible/CodingCompat.java
+++ b/app/src/main/java/net/coding/program/compatible/CodingCompat.java
@@ -22,4 +22,9 @@ public static ClassCompatInterface instance() {
public Class getMainActivity() {
return substance.getMainActivity();
}
+
+ @Override
+ public Class getMainProjectFragment() {
+ return substance.getMainProjectFragment();
+ }
}
diff --git a/app/src/main/java/net/coding/program/compatible/DefaultCompatImp.java b/app/src/main/java/net/coding/program/compatible/DefaultCompatImp.java
index 479aaa3e0..e9c195538 100644
--- a/app/src/main/java/net/coding/program/compatible/DefaultCompatImp.java
+++ b/app/src/main/java/net/coding/program/compatible/DefaultCompatImp.java
@@ -1,6 +1,7 @@
package net.coding.program.compatible;
import net.coding.program.MainActivity_;
+import net.coding.program.project.MainProjectFragment_;
/**
* Created by chenchao on 2016/12/29.
@@ -11,4 +12,9 @@ public class DefaultCompatImp implements ClassCompatInterface {
public Class getMainActivity() {
return MainActivity_.class;
}
+
+ @Override
+ public Class getMainProjectFragment() {
+ return MainProjectFragment_.FragmentBuilder_.class;
+ }
}
diff --git a/app/src/main/java/net/coding/program/project/ProjectFragment.java b/app/src/main/java/net/coding/program/project/ProjectFragment.java
index 652daeec7..b3118f45e 100755
--- a/app/src/main/java/net/coding/program/project/ProjectFragment.java
+++ b/app/src/main/java/net/coding/program/project/ProjectFragment.java
@@ -192,9 +192,6 @@ void action_search_pick() {
@OnActivityResult(RESULT_PROJECT_SEARCH_PICK)
final void resultPickSearch(int result, Intent intent) {
if (result == Activity.RESULT_OK) {
-// ProjectObject projectObject = (ProjectObject) intent.getSerializableExtra("data");
-// Intent intent1 = new Intent();
-// intent1.putExtra("data", proj);
getActivity().setResult(Activity.RESULT_OK, intent);
getActivity().finish();
}
diff --git a/app/src/main/res/layout/project_list_fragment.xml b/app/src/main/res/layout/project_list_fragment.xml
index 82b0538aa..08598e520 100755
--- a/app/src/main/res/layout/project_list_fragment.xml
+++ b/app/src/main/res/layout/project_list_fragment.xml
@@ -1,6 +1,7 @@
48dp
0.5dp
60dp
+
+ 15dp
+ 15dp
+ 15dp
+ 0.5dp
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2b8c2a370..da6263a32 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -210,5 +210,6 @@
Bug
功能
调研
+ 再按一次退出Coding
\ No newline at end of file
From 4951e0840abbdaa1d80f0a510e65c6bd87603ee1 Mon Sep 17 00:00:00 2001
From: 8206503 <8206503@qq.com>
Date: Tue, 3 Jan 2017 19:16:13 +0800
Subject: [PATCH 012/898] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../project/EnterpriseProjectFragment.java | 21 +-
.../enterprise_project_all_list_item.xml | 205 ++++++++++++++++++
2 files changed, 212 insertions(+), 14 deletions(-)
create mode 100755 app/src/enterprise/res/layout/enterprise_project_all_list_item.xml
diff --git a/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectFragment.java b/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectFragment.java
index 874598abf..f29de9bcc 100644
--- a/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectFragment.java
+++ b/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectFragment.java
@@ -107,7 +107,7 @@ private void onRefresh() {
@OnActivityResult(InitProUtils.REQUEST_PRO_UPDATE)
void onResultRefresh() {
- onRefresh();
+ onRefresh();
}
@Override
@@ -209,7 +209,7 @@ public ProjectAdapter(List list) {
@Override
protected int getNormalLayoutResId() {
- return R.layout.project_all_list_item;
+ return R.layout.enterprise_project_all_list_item;
}
@Override
@@ -223,18 +223,13 @@ protected void withBindHolder(ProjectHolder holder, ProjectObject data, int posi
ProjectObject item = (ProjectObject) getItem(position);
holder.privatePin.setVisibility(item.isPin() ? View.VISIBLE : View.INVISIBLE);
- holder.privateIcon.setVisibility(item.isPublic() ? View.INVISIBLE : View.VISIBLE);
String ownerName = item.owner_user_name;
holder.content.setText(ownerName);
- if (!item.isPublic()) {
- holder.name.setVisibility(View.VISIBLE);
- holder.name.setText(item.name);
- holder.name2.setVisibility(View.INVISIBLE);
- } else {
- holder.name2.setVisibility(View.VISIBLE);
- holder.name2.setText(item.name);
- holder.name.setVisibility(View.INVISIBLE);
- }
+
+ holder.name2.setVisibility(View.VISIBLE);
+ holder.name2.setText(item.name);
+ holder.name.setVisibility(View.INVISIBLE);
+
holder.desc.setText(item.getDescription());
setClickEvent(holder.fLayoutAction, position);
int count = item.un_read_activities_count;
@@ -286,7 +281,6 @@ class ProjectHolder extends UltimateRecyclerviewViewHolder {
TextView content;
TextView desc;
BadgeView badge;
- View privateIcon;
ImageView privatePin;
View fLayoutAction;
View rootLayout;
@@ -302,7 +296,6 @@ public ProjectHolder(View view) {
image = (ImageView) view.findViewById(R.id.icon);
content = (TextView) view.findViewById(R.id.comment);
badge = (BadgeView) view.findViewById(R.id.badge);
- privateIcon = view.findViewById(R.id.privateIcon);
fLayoutAction = view.findViewById(R.id.flayoutAction);
desc = (TextView) view.findViewById(R.id.txtDesc);
privatePin = (ImageView) view.findViewById(R.id.privatePin);
diff --git a/app/src/enterprise/res/layout/enterprise_project_all_list_item.xml b/app/src/enterprise/res/layout/enterprise_project_all_list_item.xml
new file mode 100755
index 000000000..f6d485ea4
--- /dev/null
+++ b/app/src/enterprise/res/layout/enterprise_project_all_list_item.xml
@@ -0,0 +1,205 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From 6e0e8b674292376b6dc9aa341c765ec17257e5d3 Mon Sep 17 00:00:00 2001
From: 8206503 <8206503@qq.com>
Date: Tue, 3 Jan 2017 21:49:44 +0800
Subject: [PATCH 013/898] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E8=AE=A8=E8=AE=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../program/compatible/ClassCompatImp.java | 12 ++
.../project/EnterpriseProjectFragment.java | 4 +-
.../EnterpriseProjectHomeFragment.java | 28 ++++
.../layout/enterprise_fragment_project.xml | 127 ++++++++++++++++++
.../common/htmltext/URLSpanNoUnderline.java | 3 +-
.../compatible/ClassCompatInterface.java | 7 +
.../program/compatible/CodingCompat.java | 9 ++
.../program/compatible/DefaultCompatImp.java | 22 +++
.../project/BaseProjectHomeFragment.java | 29 ++--
.../project/PrivateProjectHomeFragment.java | 120 +++++++----------
.../program/project/ProjectHomeActivity.java | 20 +--
.../project/PublicProjectHomeFragment.java | 53 ++++----
.../project/detail/ProjectActivity.java | 106 +--------------
.../project/detail/ProjectFunction.java | 42 ++++++
14 files changed, 356 insertions(+), 226 deletions(-)
create mode 100644 app/src/enterprise/java/net/coding/program/project/EnterpriseProjectHomeFragment.java
create mode 100755 app/src/enterprise/res/layout/enterprise_fragment_project.xml
create mode 100644 app/src/main/java/net/coding/program/project/detail/ProjectFunction.java
diff --git a/app/src/enterprise/java/net/coding/program/compatible/ClassCompatImp.java b/app/src/enterprise/java/net/coding/program/compatible/ClassCompatImp.java
index dbf0827c5..1c2f85fd5 100644
--- a/app/src/enterprise/java/net/coding/program/compatible/ClassCompatImp.java
+++ b/app/src/enterprise/java/net/coding/program/compatible/ClassCompatImp.java
@@ -1,7 +1,11 @@
package net.coding.program.compatible;
+import android.support.v4.app.Fragment;
+
import net.coding.program.EnterpriseMainActivity_;
+import net.coding.program.model.ProjectObject;
import net.coding.program.project.EnterpriseProjectFragment_;
+import net.coding.program.project.EnterpriseProjectHomeFragment_;
/**
* Created by chenchao on 2016/12/28.
@@ -18,4 +22,12 @@ public Class getMainActivity() {
public Class getMainProjectFragment() {
return EnterpriseProjectFragment_.FragmentBuilder_.class;
}
+
+ @Override
+ public Fragment getProjectHome(ProjectObject projectObject, boolean needReload) {
+ return EnterpriseProjectHomeFragment_.builder()
+ .mProjectObject(projectObject)
+ .needReload(needReload)
+ .build();
+ }
}
diff --git a/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectFragment.java b/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectFragment.java
index f29de9bcc..0dbad5f91 100644
--- a/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectFragment.java
+++ b/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectFragment.java
@@ -72,6 +72,7 @@ void initEnterpriseProjectFramgent() {
// mFootUpdate.showLoading();
// listView.setLoadMoreView(mFootUpdate.getView());
+ listData = AccountInfo.loadProjects(getActivity());
projectAdapter = new ProjectAdapter(listData);
listView.setAdapter(projectAdapter);
@@ -220,7 +221,7 @@ protected ProjectHolder newViewHolder(View view) {
@Override
protected void withBindHolder(ProjectHolder holder, ProjectObject data, int position) {
- ProjectObject item = (ProjectObject) getItem(position);
+ ProjectObject item = getItem(position);
holder.privatePin.setVisibility(item.isPin() ? View.VISIBLE : View.INVISIBLE);
String ownerName = item.owner_user_name;
@@ -239,7 +240,6 @@ protected void withBindHolder(ProjectHolder holder, ProjectObject data, int posi
holder.fLayoutAction.setVisibility(View.VISIBLE);
holder.rootLayout.setTag(item);
iconfromNetwork(holder.image, item.icon, ImageLoadTool.optionsRounded2);
-
}
@Override
diff --git a/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectHomeFragment.java b/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectHomeFragment.java
new file mode 100644
index 000000000..1ff40c8c7
--- /dev/null
+++ b/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectHomeFragment.java
@@ -0,0 +1,28 @@
+package net.coding.program.project;
+
+import net.coding.program.R;
+import net.coding.program.project.detail.ProjectFunction;
+
+import org.androidannotations.annotations.EFragment;
+
+/**
+ * Created by chenchao on 2017/1/3.
+ */
+
+@EFragment(R.layout.enterprise_fragment_project)
+//@OptionsMenu(R.menu.menu_fragment_project_home)
+public class EnterpriseProjectHomeFragment extends PrivateProjectHomeFragment {
+
+ @Override
+ protected ProjectFunction[] getItems() {
+ return new ProjectFunction[]{
+ ProjectFunction.dynamic,
+ ProjectFunction.task,
+ ProjectFunction.document,
+ ProjectFunction.code,
+ ProjectFunction.member,
+ ProjectFunction.readme,
+ ProjectFunction.merge
+ };
+ }
+}
diff --git a/app/src/enterprise/res/layout/enterprise_fragment_project.xml b/app/src/enterprise/res/layout/enterprise_fragment_project.xml
new file mode 100755
index 000000000..28f777989
--- /dev/null
+++ b/app/src/enterprise/res/layout/enterprise_fragment_project.xml
@@ -0,0 +1,127 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/net/coding/program/common/htmltext/URLSpanNoUnderline.java b/app/src/main/java/net/coding/program/common/htmltext/URLSpanNoUnderline.java
index be1b652d6..ef1b77e5a 100644
--- a/app/src/main/java/net/coding/program/common/htmltext/URLSpanNoUnderline.java
+++ b/app/src/main/java/net/coding/program/common/htmltext/URLSpanNoUnderline.java
@@ -30,6 +30,7 @@
import net.coding.program.project.detail.GitViewActivity_;
import net.coding.program.project.detail.ProjectActivity;
import net.coding.program.project.detail.ProjectActivity_;
+import net.coding.program.project.detail.ProjectFunction;
import net.coding.program.project.detail.merge.CommitFileListActivity_;
import net.coding.program.project.detail.merge.MergeDetailActivity_;
import net.coding.program.project.detail.topic.TopicListDetailActivity;
@@ -136,7 +137,7 @@ public static boolean openActivityByUri(Context context, String uri, boolean new
matcher.group(1), matcher.group(2)
);
intent.putExtra("mJumpParam", param);
- intent.putExtra("mJumpType", ProjectActivity.ProjectJumpParam.JumpType.typeTopic);
+ intent.putExtra("mJumpType", ProjectFunction.topic);
context.startActivity(intent);
return true;
}
diff --git a/app/src/main/java/net/coding/program/compatible/ClassCompatInterface.java b/app/src/main/java/net/coding/program/compatible/ClassCompatInterface.java
index 82e4c7bcc..e07944c1c 100644
--- a/app/src/main/java/net/coding/program/compatible/ClassCompatInterface.java
+++ b/app/src/main/java/net/coding/program/compatible/ClassCompatInterface.java
@@ -1,7 +1,12 @@
package net.coding.program.compatible;
+import android.support.v4.app.Fragment;
+
+import net.coding.program.model.ProjectObject;
+
/**
* Created by chenchao on 2016/12/28.
+ * 用于抽象出 普通版 和 企业编 不同的地方
*/
public interface ClassCompatInterface {
@@ -10,4 +15,6 @@ public interface ClassCompatInterface {
Class getMainProjectFragment();
+ Fragment getProjectHome(ProjectObject projectObject, boolean needRelaod);
+
}
diff --git a/app/src/main/java/net/coding/program/compatible/CodingCompat.java b/app/src/main/java/net/coding/program/compatible/CodingCompat.java
index 21850c969..4b330c4c6 100644
--- a/app/src/main/java/net/coding/program/compatible/CodingCompat.java
+++ b/app/src/main/java/net/coding/program/compatible/CodingCompat.java
@@ -1,5 +1,9 @@
package net.coding.program.compatible;
+import android.support.v4.app.Fragment;
+
+import net.coding.program.model.ProjectObject;
+
/**
* Created by chenchao on 2016/12/28.
*/
@@ -27,4 +31,9 @@ public Class getMainActivity() {
public Class getMainProjectFragment() {
return substance.getMainProjectFragment();
}
+
+ @Override
+ public Fragment getProjectHome(ProjectObject projectObject, boolean needReload) {
+ return substance.getProjectHome(projectObject, needReload);
+ }
}
diff --git a/app/src/main/java/net/coding/program/compatible/DefaultCompatImp.java b/app/src/main/java/net/coding/program/compatible/DefaultCompatImp.java
index e9c195538..a5bdd8c67 100644
--- a/app/src/main/java/net/coding/program/compatible/DefaultCompatImp.java
+++ b/app/src/main/java/net/coding/program/compatible/DefaultCompatImp.java
@@ -1,13 +1,20 @@
package net.coding.program.compatible;
+import android.support.v4.app.Fragment;
+
import net.coding.program.MainActivity_;
+import net.coding.program.model.ProjectObject;
import net.coding.program.project.MainProjectFragment_;
+import net.coding.program.project.PrivateProjectHomeFragment_;
+import net.coding.program.project.PublicProjectHomeFragment_;
/**
* Created by chenchao on 2016/12/29.
+ * coding
*/
public class DefaultCompatImp implements ClassCompatInterface {
+
@Override
public Class getMainActivity() {
return MainActivity_.class;
@@ -17,4 +24,19 @@ public Class getMainActivity() {
public Class getMainProjectFragment() {
return MainProjectFragment_.FragmentBuilder_.class;
}
+
+ @Override
+ public Fragment getProjectHome(ProjectObject projectObject, boolean needReload) {
+ if (projectObject.isPublic()) {
+ return PublicProjectHomeFragment_.builder()
+ .mProjectObject(projectObject)
+ .needReload(needReload)
+ .build();
+ } else {
+ return PrivateProjectHomeFragment_.builder()
+ .mProjectObject(projectObject)
+ .needReload(needReload)
+ .build();
+ }
+ }
}
diff --git a/app/src/main/java/net/coding/program/project/BaseProjectHomeFragment.java b/app/src/main/java/net/coding/program/project/BaseProjectHomeFragment.java
index 051cfb148..147fef499 100644
--- a/app/src/main/java/net/coding/program/project/BaseProjectHomeFragment.java
+++ b/app/src/main/java/net/coding/program/project/BaseProjectHomeFragment.java
@@ -30,20 +30,22 @@ public abstract class BaseProjectHomeFragment extends BaseFragment {
public static final String HOST_VISTIT = Global.HOST_API + "/project/%d/update_visit";
protected boolean isUpdateDynamic = false;
+
@FragmentArg
ProjectObject mProjectObject;
+
+ @FragmentArg
+ boolean needReload = true;
+
@ViewById
- View recommendIcon;
+ View recommendIcon, projectHeaderLayout;
+
@ViewById
ImageView projectIcon;
+
@ViewById
- TextView projectName;
- @ViewById
- TextView description;
- @ViewById
- TextView projectAuthor;
- @ViewById
- View projectHeaderLayout;
+ TextView projectName, description, projectAuthor;
+
BadgeView dynamicBadge;
private boolean isBackToRefresh = false;
@@ -65,13 +67,10 @@ protected final void initBaseProjectHomeFragment() {
private void isEnableProjectSet(View view) {
if (mProjectObject.isMy()) {
- view.findViewById(R.id.projectHeaderLayout).setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- Intent intent = new Intent(getActivity(), ProjectSetActivity_.class);
- intent.putExtra("projectObject", mProjectObject);
- startActivityForResult(intent, InitProUtils.REQUEST_PRO_UPDATE);
- }
+ view.findViewById(R.id.projectHeaderLayout).setOnClickListener(v -> {
+ Intent intent = new Intent(getActivity(), ProjectSetActivity_.class);
+ intent.putExtra("projectObject", mProjectObject);
+ startActivityForResult(intent, InitProUtils.REQUEST_PRO_UPDATE);
});
} else {
diff --git a/app/src/main/java/net/coding/program/project/PrivateProjectHomeFragment.java b/app/src/main/java/net/coding/program/project/PrivateProjectHomeFragment.java
index b7fdf1035..c8fd3ffc6 100644
--- a/app/src/main/java/net/coding/program/project/PrivateProjectHomeFragment.java
+++ b/app/src/main/java/net/coding/program/project/PrivateProjectHomeFragment.java
@@ -8,8 +8,8 @@
import net.coding.program.R;
import net.coding.program.common.Global;
import net.coding.program.common.RedPointTip;
-import net.coding.program.project.detail.ProjectActivity;
import net.coding.program.project.detail.ProjectActivity_;
+import net.coding.program.project.detail.ProjectFunction;
import net.coding.program.project.maopao.ProjectMaopaoActivity_;
import org.androidannotations.annotations.AfterViews;
@@ -25,85 +25,67 @@ public class PrivateProjectHomeFragment extends BaseProjectHomeFragment {
@ViewById
View codeLayout0, codeLayout1;
+ protected ProjectFunction[] getItems() {
+ return new ProjectFunction[] {
+ ProjectFunction.dynamic,
+ ProjectFunction.task,
+ ProjectFunction.topic,
+ ProjectFunction.document,
+ ProjectFunction.code,
+ ProjectFunction.member,
+ ProjectFunction.readme,
+ ProjectFunction.merge
+ };
+ }
+
@AfterViews
protected void initPrivateProjectHomeFragment() {
- final String buttonTitle[] = new String[]{
- "动态",
- "任务",
- "讨论",
- "文件",
- "代码",
- "成员",
- "Readme",
- "Merge Request"
- };
+// final String buttonTitle[] = getItemsTitle();
+// final int buttonIcon[] = getItemsIcon();
+// final int buttonId[] = getItemsId();
- final int buttonIcon[] = new int[]{
- R.drawable.project_button_icon_dynamic,
- R.drawable.project_button_icon_task,
- R.drawable.project_button_icon_topic,
- R.drawable.project_button_icon_docment,
- R.drawable.project_button_icon_code,
- R.drawable.project_button_icon_member,
- R.drawable.project_button_icon_readme,
- R.drawable.project_button_icon_merge,
- };
+ final ProjectFunction[] items = getItems();
- final int buttonId[] = new int[]{
- R.id.itemDynamic,
- R.id.itemTask,
- R.id.itemTopic,
- R.id.itemDocment,
- R.id.itemCode,
- R.id.itemMember,
- R.id.itemReadme,
- R.id.itemMerge
- };
+ for (ProjectFunction item : items) {
+ View view = getView().findViewById(item.id);
+ view.findViewById(R.id.icon).setBackgroundResource(item.icon);
+ ((TextView) view.findViewById(R.id.title)).setText(item.title);
+
+ view.setOnClickListener(v -> {
+ switch (v.getId()) {
+ case R.id.itemDynamic:
+ updateDynamic();
+ break;
+
+ case R.id.itemTask:
+ break;
+
+ case R.id.itemCode:
+ break;
+
+ case R.id.itemReadme:
+ break;
+
+ case R.id.itemMerge:
+ markUsed(RedPointTip.Type.Merge320);
+ break;
- for (int i = 0; i < buttonId.length; ++i) {
- View item = getView().findViewById(buttonId[i]);
- item.findViewById(R.id.icon).setBackgroundResource(buttonIcon[i]);
- ((TextView) item.findViewById(R.id.title)).setText(buttonTitle[i]);
- final int pos = i;
- item.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- switch (buttonId[pos]) {
- case R.id.itemDynamic:
- updateDynamic();
- break;
-
- case R.id.itemTask:
- break;
-
- case R.id.itemCode:
- break;
-
- case R.id.itemReadme:
- break;
-
- case R.id.itemMerge:
- markUsed(RedPointTip.Type.Merge320);
- break;
-
- case R.id.itemDocment:
- markUsed(RedPointTip.Type.File320);
- break;
- }
-
- ProjectActivity_.intent(PrivateProjectHomeFragment.this)
- .mProjectObject(mProjectObject)
- .mJumpType(ProjectActivity.PRIVATE_JUMP_TYPES[pos])
- .start();
+ case R.id.itemDocment:
+ markUsed(RedPointTip.Type.File320);
+ break;
}
+ ProjectActivity_.intent(PrivateProjectHomeFragment.this)
+ .mProjectObject(mProjectObject)
+ .mJumpType(ProjectFunction.idToEnum(v.getId()))
+ .start();
});
- if (buttonId[i] == R.id.itemDynamic) {
- dynamicBadge = (BadgeView) item.findViewById(R.id.badge);
+ if (item.id == R.id.itemDynamic) {
+ dynamicBadge = (BadgeView) view.findViewById(R.id.badge);
Global.setBadgeView(dynamicBadge, mProjectObject.un_read_activities_count);
} else {
- Global.setBadgeView((BadgeView) item.findViewById(R.id.badge), 0);
+ Global.setBadgeView((BadgeView) view.findViewById(R.id.badge), 0);
}
}
diff --git a/app/src/main/java/net/coding/program/project/ProjectHomeActivity.java b/app/src/main/java/net/coding/program/project/ProjectHomeActivity.java
index 401a2ea85..a98218ba1 100644
--- a/app/src/main/java/net/coding/program/project/ProjectHomeActivity.java
+++ b/app/src/main/java/net/coding/program/project/ProjectHomeActivity.java
@@ -12,6 +12,7 @@
import net.coding.program.FileUrlActivity;
import net.coding.program.R;
import net.coding.program.common.ui.BaseActivity;
+import net.coding.program.compatible.CodingCompat;
import net.coding.program.model.ProjectObject;
import net.coding.program.project.detail.ProjectActivity;
import net.coding.program.project.init.InitProUtils;
@@ -26,7 +27,6 @@
import org.json.JSONObject;
@EActivity(R.layout.activity_project_home)
-//@OptionsMenu(R.menu.menu_project_home)
public class ProjectHomeActivity extends BaseActivity {
public static final String BROADCAST_CLOSE = ProjectHomeActivity.class.getName() + ".close";
@@ -58,7 +58,7 @@ protected void initProjectHomeActivity() {
}
if (mProjectObject != null) {
- initFragment();
+ initFragment(true);
} else if (mJumpParam != null) {
mProjectUrl = String.format(FileUrlActivity.HOST_PROJECT, mJumpParam.mUser, mJumpParam.mProject);
getNetwork(mProjectUrl, mProjectUrl);
@@ -96,7 +96,7 @@ public void parseJson(int code, JSONObject respanse, String tag, int pos, Object
if (tag.equals(mProjectUrl)) {
if (code == 0) {
mProjectObject = new ProjectObject(respanse.getJSONObject("data"));
- initFragment();
+ initFragment(false);
} else {
showErrorMsg(code, respanse);
}
@@ -109,23 +109,13 @@ public void parseJson(int code, JSONObject respanse, String tag, int pos, Object
}
}
- private void initFragment() {
+ private void initFragment(boolean needRelaod) {
if (mNeedUpdateList) {
String url = String.format(PrivateProjectHomeFragment.HOST_VISTIT, mProjectObject.getId());
getNetwork(url, PrivateProjectHomeFragment.HOST_VISTIT);
}
- Fragment fragment;
- if (mProjectObject.isPublic()) {
- fragment = PublicProjectHomeFragment_.builder()
- .mProjectObject(mProjectObject)
- .build();
- } else {
- fragment = PrivateProjectHomeFragment_.builder()
- .mProjectObject(mProjectObject)
- .build();
- }
-
+ Fragment fragment = CodingCompat.instance().getProjectHome(mProjectObject, needRelaod);
getSupportFragmentManager()
.beginTransaction()
.add(R.id.container, fragment)
diff --git a/app/src/main/java/net/coding/program/project/PublicProjectHomeFragment.java b/app/src/main/java/net/coding/program/project/PublicProjectHomeFragment.java
index 13fa0e720..741679633 100644
--- a/app/src/main/java/net/coding/program/project/PublicProjectHomeFragment.java
+++ b/app/src/main/java/net/coding/program/project/PublicProjectHomeFragment.java
@@ -17,6 +17,7 @@
import net.coding.program.project.detail.MembersSelectActivity_;
import net.coding.program.project.detail.ProjectActivity;
import net.coding.program.project.detail.ProjectActivity_;
+import net.coding.program.project.detail.ProjectFunction;
import net.coding.program.project.git.ForksListActivity_;
import org.androidannotations.annotations.AfterViews;
@@ -36,10 +37,12 @@ public class PublicProjectHomeFragment extends BaseProjectHomeFragment {
ProjectMarkButton mButtonStar;
ProjectMarkButton mButtonWatch;
ProjectMarkButton mButtonFork;
+
String mUrlStar;
String mUrlUnstar;
String mUrlWatch;
String mUrlUnwatch;
+
private String httpProjectObject;
private String forkUrl;
@@ -55,7 +58,12 @@ final void init() {
initHead3(mRoot);
httpProjectObject = mProjectObject.getHttpProjectObject();
- getNetwork(httpProjectObject);
+
+ if (needReload) {
+ getNetwork(httpProjectObject);
+ } else {
+ initHead2();
+ }
}
@Override
@@ -209,30 +217,27 @@ private void initHead3(View root) {
item.findViewById(R.id.icon).setBackgroundResource(buttonBackgrounds[i]);
((TextView) item.findViewById(R.id.title)).setText(titles[i]);
final int pos = i;
- item.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- switch (buttons[pos]) {
- case R.id.itemDynamic:
- updateDynamic();
- break;
-
- case R.id.itemCode:
- break;
-
- case R.id.itemReadme:
- break;
-
- case R.id.itemMerge:
- markUsed(RedPointTip.Type.Merge320);
- break;
- }
-
- ProjectActivity_.intent(PublicProjectHomeFragment.this)
- .mProjectObject(mProjectObject)
- .mJumpType(ProjectActivity.PUBLIC_JUMP_TYPES[pos])
- .start();
+ item.setOnClickListener(v -> {
+ switch (buttons[pos]) {
+ case R.id.itemDynamic:
+ updateDynamic();
+ break;
+
+ case R.id.itemCode:
+ break;
+
+ case R.id.itemReadme:
+ break;
+
+ case R.id.itemMerge:
+ markUsed(RedPointTip.Type.Merge320);
+ break;
}
+
+ ProjectActivity_.intent(PublicProjectHomeFragment.this)
+ .mProjectObject(mProjectObject)
+ .mJumpType(ProjectFunction.idToEnum(v.getId()))
+ .start();
});
if (titles[i].equals("动态")) {
diff --git a/app/src/main/java/net/coding/program/project/detail/ProjectActivity.java b/app/src/main/java/net/coding/program/project/detail/ProjectActivity.java
index 1f6f25be2..01db7747c 100755
--- a/app/src/main/java/net/coding/program/project/detail/ProjectActivity.java
+++ b/app/src/main/java/net/coding/program/project/detail/ProjectActivity.java
@@ -17,7 +17,6 @@
import net.coding.program.model.ProjectObject;
import net.coding.program.project.detail.merge.ProjectMergeFragment_;
import net.coding.program.project.detail.merge.ProjectPullFragment_;
-import net.coding.program.project.detail.readme.ReadmeFragment_;
import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.EActivity;
@@ -29,7 +28,6 @@
import java.io.Serializable;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -37,25 +35,6 @@
@EActivity(R.layout.activity_project_parent)
public class ProjectActivity extends BackActivity implements NetworkCallback {
- public static final ProjectJumpParam.JumpType[] PRIVATE_JUMP_TYPES = new ProjectJumpParam.JumpType[]{
- ProjectJumpParam.JumpType.typeDynamic,
- ProjectJumpParam.JumpType.typeTask,
- ProjectJumpParam.JumpType.typeTopic,
- ProjectJumpParam.JumpType.typeDocument,
- ProjectJumpParam.JumpType.typeCode,
- ProjectJumpParam.JumpType.typeMember,
- ProjectJumpParam.JumpType.typeReadme,
- ProjectJumpParam.JumpType.typeMerge
- };
- public static final ProjectJumpParam.JumpType[] PUBLIC_JUMP_TYPES = new ProjectJumpParam.JumpType[]{
- ProjectJumpParam.JumpType.typeDynamic,
- ProjectJumpParam.JumpType.typeTopic,
- ProjectJumpParam.JumpType.typeCode,
- ProjectJumpParam.JumpType.typeMember,
- ProjectJumpParam.JumpType.typeReadme,
- ProjectJumpParam.JumpType.typeMerge
- };
-
@Extra
ProjectObject mProjectObject;
@@ -63,37 +42,11 @@ public class ProjectActivity extends BackActivity implements NetworkCallback {
ProjectJumpParam mJumpParam;
@Extra
- ProjectJumpParam.JumpType mJumpType = ProjectJumpParam.JumpType.typeDynamic;
+ ProjectFunction mJumpType = ProjectFunction.dynamic;
List> mFragments = new ArrayList<>();
- ArrayList project_activity_action_list = new ArrayList<>(Arrays.asList(
- "项目动态",
- "项目讨论",
- "项目代码",
- "项目成员",
- "readme",
- "mergerequest"
- ));
String urlProject;
- // MaopaoTypeAdapter mSpinnerAdapter;
- ArrayList spinnerIcons = new ArrayList<>(Arrays.asList(
- R.drawable.ic_spinner_dynamic,
- R.drawable.ic_spinner_topic,
- R.drawable.ic_spinner_git,
- R.drawable.ic_spinner_user,
- R.drawable.ic_spinner_user,
- R.drawable.ic_spinner_user
- ));
-
- ArrayList spinnerFragments = new ArrayList(Arrays.asList(
- ProjectDynamicParentFragment_.class,
- TopicFragment_.class,
- ProjectGitFragmentMain_.class,
- MembersListFragment_.class,
- ReadmeFragment_.class,
- ProjectPullFragment_.class
- ));
private NetworkImpl networkImpl;
@AfterViews
@@ -117,7 +70,7 @@ protected void initProjectActivity() {
} else if (mProjectObject != null) {
//setActionBarTitle(mProjectObject.name);
- initData();
+ selectFragment();
} else {
finish();
@@ -129,7 +82,7 @@ public void parseJson(int code, JSONObject respanse, String tag, int pos, Object
if (tag.equals(urlProject)) {
if (code == 0) {
mProjectObject = new ProjectObject(respanse.getJSONObject("data"));
- initData();
+ selectFragment();
} else {
Toast.makeText(this, Global.getErrorMsg(respanse), Toast.LENGTH_LONG).show();
}
@@ -141,47 +94,12 @@ public void getNetwork(String uri, String tag) {
networkImpl.loadData(uri, null, tag, -1, null, NetworkImpl.Request.Get);
}
- private void initData() {
- // 私有项目才有任务
- if (!mProjectObject.isPublic()) {
- final int insertPos = 1;
- spinnerIcons.add(insertPos, R.drawable.ic_spinner_task);
- spinnerFragments.add(insertPos, ProjectTaskFragment_.class);
- project_activity_action_list.add(insertPos, "项目任务");
-
- // 私有项目添加项目文件
- final int insertAttPos = 3;
- spinnerIcons.add(insertAttPos, R.drawable.ic_spinner_attachment);
- spinnerFragments.add(insertAttPos, ProjectAttachmentFragment_.class);
- project_activity_action_list.add(insertAttPos, "项目文件");
- }
- selectFragment(getJumpPos());
- }
-
- private int getJumpPos() {
- if (mProjectObject.isPublic()) {
- for (int i = 0; i < PUBLIC_JUMP_TYPES.length; ++i) {
- if (PUBLIC_JUMP_TYPES[i] == mJumpType) {
- return i;
- }
- }
- } else {
- for (int i = 0; i < PRIVATE_JUMP_TYPES.length; ++i) {
- if (PRIVATE_JUMP_TYPES[i] == mJumpType) {
- return i;
- }
- }
- }
-
- return 0;
- }
-
- private void selectFragment(int position) {
+ private void selectFragment() {
Fragment fragment;
Bundle bundle = new Bundle();
try {
- Class fragmentClass = spinnerFragments.get(position);
+ Class fragmentClass = mJumpType.fragment;
if (fragmentClass == ProjectPullFragment_.class && !mProjectObject.isPublic()) {
fragmentClass = ProjectMergeFragment_.class;
}
@@ -193,7 +111,7 @@ private void selectFragment(int position) {
fragment.setArguments(bundle);
FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
- ft.replace(R.id.container, fragment, project_activity_action_list.get(position));
+ ft.replace(R.id.container, fragment, fragmentClass.getName());
ft.commit();
mFragments.add(new WeakReference(fragment));
@@ -248,17 +166,5 @@ private boolean isMatch(String path, String regex) {
return false;
}
-
- public enum JumpType {
- typeDynamic,
- typeTask,
- typeTopic,
- typeDocument,
- typeCode,
- typeMember,
- typeReadme,
- typeMerge,
- typeHome
- }
}
}
diff --git a/app/src/main/java/net/coding/program/project/detail/ProjectFunction.java b/app/src/main/java/net/coding/program/project/detail/ProjectFunction.java
new file mode 100644
index 000000000..375dcac90
--- /dev/null
+++ b/app/src/main/java/net/coding/program/project/detail/ProjectFunction.java
@@ -0,0 +1,42 @@
+package net.coding.program.project.detail;
+
+import net.coding.program.R;
+import net.coding.program.project.detail.merge.ProjectPullFragment_;
+import net.coding.program.project.detail.readme.ReadmeFragment_;
+
+/**
+ * Created by chenchao on 2017/1/3.
+ */
+public enum ProjectFunction {
+
+ dynamic(R.id.itemDynamic, R.drawable.project_button_icon_dynamic, "动态", ProjectDynamicParentFragment_.class),
+ task(R.id.itemTask, R.drawable.project_button_icon_task, "任务", ProjectTaskFragment_.class),
+ topic(R.id.itemTopic, R.drawable.project_button_icon_topic, "讨论", TopicFragment_.class),
+ document(R.id.itemDocment, R.drawable.project_button_icon_docment, "文件", ProjectAttachmentFragment_.class),
+ code(R.id.itemCode, R.drawable.project_button_icon_code, "代码", ProjectGitFragmentMain_.class),
+ member(R.id.itemMember, R.drawable.project_button_icon_member, "成员", MembersListFragment_.class),
+ readme(R.id.itemReadme, R.drawable.project_button_icon_readme, "Readme", ReadmeFragment_.class),
+ merge(R.id.itemMerge, R.drawable.project_button_icon_merge, "Merge Request", ProjectPullFragment_.class);
+
+ public int id;
+ public int icon;
+ public String title;
+ public Class fragment;
+
+ ProjectFunction(int id, int icon, String title, Class fragment) {
+ this.id = id;
+ this.icon = icon;
+ this.title = title;
+ this.fragment = fragment;
+ }
+
+ public static ProjectFunction idToEnum(int id) {
+ for (ProjectFunction item : values()) {
+ if (item.id == id) {
+ return item;
+ }
+ }
+
+ return dynamic;
+ }
+}
From f78cd7e6aeb72f1a083b818e8bc63d8cd11599c9 Mon Sep 17 00:00:00 2001
From: 8206503 <8206503@qq.com>
Date: Wed, 4 Jan 2017 10:07:12 +0800
Subject: [PATCH 014/898] =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=A0=8F=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../coding/program/project/detail/ProjectActivity.java | 10 ++++++++++
app/src/main/res/layout/activity_project_content.xml | 5 ++---
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/net/coding/program/project/detail/ProjectActivity.java b/app/src/main/java/net/coding/program/project/detail/ProjectActivity.java
index 01db7747c..59e49e0a8 100755
--- a/app/src/main/java/net/coding/program/project/detail/ProjectActivity.java
+++ b/app/src/main/java/net/coding/program/project/detail/ProjectActivity.java
@@ -6,6 +6,7 @@
import android.support.v4.app.FragmentTransaction;
import android.support.v7.app.ActionBar;
import android.support.v7.widget.Toolbar;
+import android.widget.TextView;
import android.widget.Toast;
import net.coding.program.FileUrlActivity;
@@ -22,6 +23,7 @@
import org.androidannotations.annotations.EActivity;
import org.androidannotations.annotations.Extra;
import org.androidannotations.annotations.OnActivityResult;
+import org.androidannotations.annotations.ViewById;
import org.json.JSONException;
import org.json.JSONObject;
@@ -49,6 +51,9 @@ public class ProjectActivity extends BackActivity implements NetworkCallback {
private NetworkImpl networkImpl;
+ @ViewById
+ TextView toolbarProjectTitle;
+
@AfterViews
protected void initProjectActivity() {
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
@@ -116,6 +121,11 @@ private void selectFragment() {
mFragments.add(new WeakReference(fragment));
+ toolbarProjectTitle.setText(mJumpType.title);
+ if (mJumpType != ProjectFunction.task) {
+ toolbarProjectTitle.setBackgroundResource(0);
+ }
+
} catch (Exception e) {
Global.errorLog(e);
}
diff --git a/app/src/main/res/layout/activity_project_content.xml b/app/src/main/res/layout/activity_project_content.xml
index 5a7e1c9ce..aa40be7dd 100755
--- a/app/src/main/res/layout/activity_project_content.xml
+++ b/app/src/main/res/layout/activity_project_content.xml
@@ -7,7 +7,6 @@
android:fitsSystemWindows="true"
tools:context=".MainActivity">
-
+ android:textColor="@color/font_green" />
-
+
From 39cb7a7e0997499c81d69b98dfbf43ebb15580a6 Mon Sep 17 00:00:00 2001
From: 8206503 <8206503@qq.com>
Date: Wed, 4 Jan 2017 10:59:20 +0800
Subject: [PATCH 015/898] =?UTF-8?q?=E4=B8=BA=E6=9B=BF=E6=8D=A2=20LoginActi?=
=?UTF-8?q?vity=20=E5=81=9A=E5=87=86=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../coding/program/compatible/ClassCompatImp.java | 11 +++++++++++
.../java/net/coding/program/EntranceActivity.java | 3 +--
.../program/common/guide/ParallaxFragment.java | 4 ++--
.../coding/program/common/network/NetworkImpl.java | 8 ++++----
.../program/compatible/ClassCompatInterface.java | 3 +++
.../net/coding/program/compatible/CodingCompat.java | 10 ++++++++++
.../coding/program/compatible/DefaultCompatImp.java | 12 ++++++++++++
.../net/coding/program/maopao/MaopaoAddActivity.java | 4 ++--
.../coding/program/setting/SetPasswordActivity.java | 4 ++--
.../net/coding/program/setting/SettingFragment.java | 4 ++--
10 files changed, 49 insertions(+), 14 deletions(-)
diff --git a/app/src/enterprise/java/net/coding/program/compatible/ClassCompatImp.java b/app/src/enterprise/java/net/coding/program/compatible/ClassCompatImp.java
index 1c2f85fd5..8f5d15a4a 100644
--- a/app/src/enterprise/java/net/coding/program/compatible/ClassCompatImp.java
+++ b/app/src/enterprise/java/net/coding/program/compatible/ClassCompatImp.java
@@ -3,6 +3,7 @@
import android.support.v4.app.Fragment;
import net.coding.program.EnterpriseMainActivity_;
+import net.coding.program.LoginActivity_;
import net.coding.program.model.ProjectObject;
import net.coding.program.project.EnterpriseProjectFragment_;
import net.coding.program.project.EnterpriseProjectHomeFragment_;
@@ -30,4 +31,14 @@ public Fragment getProjectHome(ProjectObject projectObject, boolean needReload)
.needReload(needReload)
.build();
}
+
+ @Override
+ public Class getGuideActivity() {
+ return LoginActivity_.class;
+ }
+
+ @Override
+ public Class getLoginActivity() {
+ return LoginActivity_.class;
+ }
}
diff --git a/app/src/main/java/net/coding/program/EntranceActivity.java b/app/src/main/java/net/coding/program/EntranceActivity.java
index 9a4a90d42..81b639ba5 100755
--- a/app/src/main/java/net/coding/program/EntranceActivity.java
+++ b/app/src/main/java/net/coding/program/EntranceActivity.java
@@ -20,7 +20,6 @@
import net.coding.program.common.LoginBackground;
import net.coding.program.common.UnreadNotify;
import net.coding.program.common.WeakRefHander;
-import net.coding.program.common.guide.GuideActivity;
import net.coding.program.common.ui.BaseActivity;
import net.coding.program.compatible.CodingCompat;
import net.coding.program.login.MarketingHelp;
@@ -242,7 +241,7 @@ void next() {
Intent intent;
String mGlobalKey = AccountInfo.loadAccount(this).global_key;
if (mGlobalKey.isEmpty()) {
- intent = new Intent(this, GuideActivity.class);
+ intent = new Intent(this, CodingCompat.instance().getGuideActivity());
if (background != null) {
intent.putExtra(LoginActivity.EXTRA_BACKGROUND, background);
}
diff --git a/app/src/main/java/net/coding/program/common/guide/ParallaxFragment.java b/app/src/main/java/net/coding/program/common/guide/ParallaxFragment.java
index d92335e32..616fc9ef9 100755
--- a/app/src/main/java/net/coding/program/common/guide/ParallaxFragment.java
+++ b/app/src/main/java/net/coding/program/common/guide/ParallaxFragment.java
@@ -12,8 +12,8 @@
import com.prolificinteractive.parallaxpager.ParallaxContainer;
import net.coding.program.LoginActivity;
-import net.coding.program.LoginActivity_;
import net.coding.program.R;
+import net.coding.program.compatible.CodingCompat;
import net.coding.program.login.PhoneRegisterActivity_;
public class ParallaxFragment extends Fragment implements ViewPager.OnPageChangeListener {
@@ -59,7 +59,7 @@ public void onClick(View v) {
loginButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(getActivity(), LoginActivity_.class);
+ Intent intent = new Intent(getActivity(), CodingCompat.instance().getLoginActivity());
Uri uri = ((GuideActivity) getActivity()).getUri();
if (uri != null) {
intent.putExtra(LoginActivity.EXTRA_BACKGROUND, uri);
diff --git a/app/src/main/java/net/coding/program/common/network/NetworkImpl.java b/app/src/main/java/net/coding/program/common/network/NetworkImpl.java
index 2ddb224af..d4bfd6c4b 100755
--- a/app/src/main/java/net/coding/program/common/network/NetworkImpl.java
+++ b/app/src/main/java/net/coding/program/common/network/NetworkImpl.java
@@ -10,10 +10,10 @@
import com.loopj.android.http.RequestParams;
import com.umeng.analytics.MobclickAgent;
-import net.coding.program.LoginActivity_;
import net.coding.program.common.Global;
import net.coding.program.common.ui.PopCaptchaDialog;
import net.coding.program.common.umeng.UmengEvent;
+import net.coding.program.compatible.CodingCompat;
import net.coding.program.login.SetGlobalKeyActivity;
import net.coding.program.login.SetGlobalKeyActivity_;
import net.coding.program.maopao.MaopaoListBaseFragment;
@@ -21,13 +21,13 @@
import net.coding.program.model.AccountInfo;
import net.coding.program.user.UserDetailActivity;
-import cz.msebera.android.httpclient.Header;
-import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.HashMap;
+import cz.msebera.android.httpclient.Header;
+
public class NetworkImpl {
public static final int ERROR_PERMISSION_DENIED = 1400;
public static final int NETWORK_ERROR = -1;
@@ -88,7 +88,7 @@ public void onSuccess(int statusCode, Header[] headers, JSONObject response) {
int code = response.getInt("code");
if (code == HTTP_CODE_RELOGIN || code == HTTP_CODE_RELOGIN_2FA) {
- appContext.startActivity(new Intent(appContext, LoginActivity_.class));
+ appContext.startActivity(new Intent(appContext, CodingCompat.instance().getLoginActivity()));
} else if (code == HTTP_CODE_NEED_ACTIVITY) {
if (!SetGlobalKeyActivity.isShowing()) {
Intent activityIntent = new Intent(appContext, SetGlobalKeyActivity_.class);
diff --git a/app/src/main/java/net/coding/program/compatible/ClassCompatInterface.java b/app/src/main/java/net/coding/program/compatible/ClassCompatInterface.java
index e07944c1c..a0d6ef79b 100644
--- a/app/src/main/java/net/coding/program/compatible/ClassCompatInterface.java
+++ b/app/src/main/java/net/coding/program/compatible/ClassCompatInterface.java
@@ -17,4 +17,7 @@ public interface ClassCompatInterface {
Fragment getProjectHome(ProjectObject projectObject, boolean needRelaod);
+ Class getGuideActivity();
+
+ Class getLoginActivity();
}
diff --git a/app/src/main/java/net/coding/program/compatible/CodingCompat.java b/app/src/main/java/net/coding/program/compatible/CodingCompat.java
index 4b330c4c6..014fb7f68 100644
--- a/app/src/main/java/net/coding/program/compatible/CodingCompat.java
+++ b/app/src/main/java/net/coding/program/compatible/CodingCompat.java
@@ -36,4 +36,14 @@ public Class getMainProjectFragment() {
public Fragment getProjectHome(ProjectObject projectObject, boolean needReload) {
return substance.getProjectHome(projectObject, needReload);
}
+
+ @Override
+ public Class getGuideActivity() {
+ return substance.getGuideActivity();
+ }
+
+ @Override
+ public Class getLoginActivity() {
+ return substance.getLoginActivity();
+ }
}
diff --git a/app/src/main/java/net/coding/program/compatible/DefaultCompatImp.java b/app/src/main/java/net/coding/program/compatible/DefaultCompatImp.java
index a5bdd8c67..c673ba6fc 100644
--- a/app/src/main/java/net/coding/program/compatible/DefaultCompatImp.java
+++ b/app/src/main/java/net/coding/program/compatible/DefaultCompatImp.java
@@ -2,7 +2,9 @@
import android.support.v4.app.Fragment;
+import net.coding.program.LoginActivity_;
import net.coding.program.MainActivity_;
+import net.coding.program.common.guide.GuideActivity;
import net.coding.program.model.ProjectObject;
import net.coding.program.project.MainProjectFragment_;
import net.coding.program.project.PrivateProjectHomeFragment_;
@@ -39,4 +41,14 @@ public Fragment getProjectHome(ProjectObject projectObject, boolean needReload)
.build();
}
}
+
+ @Override
+ public Class getGuideActivity() {
+ return GuideActivity.class;
+ }
+
+ @Override
+ public Class getLoginActivity() {
+ return LoginActivity_.class;
+ }
}
diff --git a/app/src/main/java/net/coding/program/maopao/MaopaoAddActivity.java b/app/src/main/java/net/coding/program/maopao/MaopaoAddActivity.java
index 15d94ab73..05633cad1 100755
--- a/app/src/main/java/net/coding/program/maopao/MaopaoAddActivity.java
+++ b/app/src/main/java/net/coding/program/maopao/MaopaoAddActivity.java
@@ -29,7 +29,6 @@
import net.coding.program.ImagePagerActivity_;
import net.coding.program.ImagePagerFragment;
-import net.coding.program.LoginActivity_;
import net.coding.program.MyApp;
import net.coding.program.R;
import net.coding.program.common.Global;
@@ -48,6 +47,7 @@
import net.coding.program.common.umeng.UmengEvent;
import net.coding.program.common.util.FileUtil;
import net.coding.program.common.util.PermissionUtil;
+import net.coding.program.compatible.CodingCompat;
import net.coding.program.maopao.item.LocationCoord;
import net.coding.program.message.EmojiFragment;
import net.coding.program.model.AccountInfo;
@@ -533,7 +533,7 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
String mGlobalKey = AccountInfo.loadAccount(this).global_key;
if (mGlobalKey.isEmpty()) {
- Intent intent = new Intent(this, LoginActivity_.class);
+ Intent intent = new Intent(this, CodingCompat.instance().getLoginActivity());
this.startActivity(intent);
}
diff --git a/app/src/main/java/net/coding/program/setting/SetPasswordActivity.java b/app/src/main/java/net/coding/program/setting/SetPasswordActivity.java
index a016c6d94..bdb233291 100755
--- a/app/src/main/java/net/coding/program/setting/SetPasswordActivity.java
+++ b/app/src/main/java/net/coding/program/setting/SetPasswordActivity.java
@@ -7,7 +7,6 @@
import com.loopj.android.http.RequestParams;
-import net.coding.program.LoginActivity_;
import net.coding.program.R;
import net.coding.program.common.Global;
import net.coding.program.common.SimpleSHA1;
@@ -15,6 +14,7 @@
import net.coding.program.common.umeng.UmengEvent;
import net.coding.program.common.util.ViewStyleUtil;
import net.coding.program.common.widget.LoginEditText;
+import net.coding.program.compatible.CodingCompat;
import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.Click;
@@ -104,7 +104,7 @@ private void popDialog() {
.setMessage("修改密码后需要重新登录")
.setNegativeButton("确定", (dialog1, which) -> {
finish();
- startActivity(new Intent(SetPasswordActivity.this, LoginActivity_.class));
+ startActivity(new Intent(SetPasswordActivity.this, CodingCompat.instance().getLoginActivity()));
})
.setCancelable(false)
.show();
diff --git a/app/src/main/java/net/coding/program/setting/SettingFragment.java b/app/src/main/java/net/coding/program/setting/SettingFragment.java
index 6ca8d6267..411ecaa46 100755
--- a/app/src/main/java/net/coding/program/setting/SettingFragment.java
+++ b/app/src/main/java/net/coding/program/setting/SettingFragment.java
@@ -16,9 +16,9 @@
import net.coding.program.MainActivity;
import net.coding.program.MyApp;
import net.coding.program.R;
-import net.coding.program.common.guide.GuideActivity;
import net.coding.program.common.ui.BaseFragment;
import net.coding.program.common.util.FileUtil;
+import net.coding.program.compatible.CodingCompat;
import net.coding.program.event.EventMessage;
import net.coding.program.model.AccountInfo;
import net.coding.program.project.detail.file.FileSaveHelp;
@@ -180,7 +180,7 @@ void loginOut() {
FragmentActivity activity = getActivity();
XGPushManager.registerPush(activity, "*");
AccountInfo.loginOut(activity);
- startActivity(new Intent(activity, GuideActivity.class));
+ startActivity(new Intent(activity, CodingCompat.instance().getGuideActivity()));
EventBus.getDefault().post(new EventMessage(EventMessage.Type.loginOut));
activity.finish();
});
From ef93c26c59cffaf77b51ac21978803c5194fa8bc Mon Sep 17 00:00:00 2001
From: 8206503 <8206503@qq.com>
Date: Wed, 4 Jan 2017 18:42:24 +0800
Subject: [PATCH 016/898] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=9B=BF=E6=8D=A2?=
=?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/enterprise/AndroidManifest.xml | 6 +-
.../net/coding/program/MyAppEnterprise.java | 4 +-
...ompatImp.java => EnterpriseCompatImp.java} | 8 +-
.../EnterpriseEmailSetPasswordActivity.java | 28 ++
.../program/user/EnterpriseLoginActivity.java | 470 ++++++++++++++++++
...enterprise_activity_email_set_password.xml | 71 +++
.../res/layout/enterprise_activity_login.xml | 242 +++++++++
.../net/coding/program/common/Global.java | 8 +
.../res/layout/activity_base_send_email.xml | 2 +-
.../res/layout/activity_email_register.xml | 2 +-
.../layout/activity_email_set_password.xml | 2 +-
.../main/res/layout/activity_modify_email.xml | 2 +-
.../res/layout/activity_phone_register.xml | 9 +-
.../layout/activity_reset_password_base.xml | 4 +-
.../res/layout/activity_set_global_key.xml | 2 +-
.../main/res/layout/activity_set_password.xml | 2 +-
.../res/layout/activity_task_add_head.xml | 2 +-
.../main/res/layout/activity_valide_phone.xml | 2 +-
app/src/main/res/layout/divideline_12.xml | 7 -
.../res/layout/enterprise_name_layout.xml | 37 ++
.../res/layout/fragment_subject_list_item.xml | 2 +-
.../res/layout/init_fragment_project_set.xml | 2 +-
app/src/main/res/values/colors.xml | 1 +
23 files changed, 882 insertions(+), 33 deletions(-)
rename app/src/enterprise/java/net/coding/program/compatible/{ClassCompatImp.java => EnterpriseCompatImp.java} (81%)
create mode 100644 app/src/enterprise/java/net/coding/program/login/phone/EnterpriseEmailSetPasswordActivity.java
create mode 100644 app/src/enterprise/java/net/coding/program/user/EnterpriseLoginActivity.java
create mode 100644 app/src/enterprise/res/layout/enterprise_activity_email_set_password.xml
create mode 100755 app/src/enterprise/res/layout/enterprise_activity_login.xml
delete mode 100644 app/src/main/res/layout/divideline_12.xml
create mode 100644 app/src/main/res/layout/enterprise_name_layout.xml
diff --git a/app/src/enterprise/AndroidManifest.xml b/app/src/enterprise/AndroidManifest.xml
index a2f9f5699..ec358b4b6 100755
--- a/app/src/enterprise/AndroidManifest.xml
+++ b/app/src/enterprise/AndroidManifest.xml
@@ -217,7 +217,7 @@
android:theme="@style/ActionbarSpannerTheme1"
android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
+
getMainActivity() {
@@ -34,11 +34,11 @@ public Fragment getProjectHome(ProjectObject projectObject, boolean needReload)
@Override
public Class getGuideActivity() {
- return LoginActivity_.class;
+ return EnterpriseLoginActivity_.class;
}
@Override
public Class getLoginActivity() {
- return LoginActivity_.class;
+ return EnterpriseLoginActivity_.class;
}
}
diff --git a/app/src/enterprise/java/net/coding/program/login/phone/EnterpriseEmailSetPasswordActivity.java b/app/src/enterprise/java/net/coding/program/login/phone/EnterpriseEmailSetPasswordActivity.java
new file mode 100644
index 000000000..8e700a3cd
--- /dev/null
+++ b/app/src/enterprise/java/net/coding/program/login/phone/EnterpriseEmailSetPasswordActivity.java
@@ -0,0 +1,28 @@
+package net.coding.program.login.phone;
+
+import net.coding.program.R;
+import net.coding.program.common.widget.LoginEditText;
+
+import org.androidannotations.annotations.AfterViews;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.Extra;
+import org.androidannotations.annotations.ViewById;
+
+/**
+ * Created by chenchao on 2017/1/4.
+ *
+ */
+@EActivity(R.layout.enterprise_activity_email_set_password)
+public class EnterpriseEmailSetPasswordActivity extends EmailSetPasswordActivity {
+
+ @Extra
+ String enterpriseName = "";
+
+ @ViewById
+ LoginEditText enterpriseEdit;
+
+ @AfterViews
+ void initEnterpriseEmailSetPasswordActivity() {
+ enterpriseEdit.setText(enterpriseName);
+ }
+}
diff --git a/app/src/enterprise/java/net/coding/program/user/EnterpriseLoginActivity.java b/app/src/enterprise/java/net/coding/program/user/EnterpriseLoginActivity.java
new file mode 100644
index 000000000..3be814697
--- /dev/null
+++ b/app/src/enterprise/java/net/coding/program/user/EnterpriseLoginActivity.java
@@ -0,0 +1,470 @@
+package net.coding.program.user;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.loopj.android.http.AsyncHttpClient;
+import com.loopj.android.http.AsyncHttpResponseHandler;
+import com.loopj.android.http.RequestParams;
+import com.nostra13.universalimageloader.core.DisplayImageOptions;
+import com.nostra13.universalimageloader.core.assist.ImageScaleType;
+import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
+import com.tencent.android.tpush.XGPushManager;
+
+import net.coding.program.EnterpriseMainActivity_;
+import net.coding.program.MyAppEnterprise;
+import net.coding.program.R;
+import net.coding.program.common.Global;
+import net.coding.program.common.SimpleSHA1;
+import net.coding.program.common.enter.SimpleTextWatcher;
+import net.coding.program.common.guide.GuideActivity;
+import net.coding.program.common.network.MyAsyncHttpClient;
+import net.coding.program.common.network.NetworkImpl;
+import net.coding.program.common.ui.BaseActivity;
+import net.coding.program.common.umeng.UmengEvent;
+import net.coding.program.common.util.FileUtil;
+import net.coding.program.common.util.InputCheck;
+import net.coding.program.common.widget.LoginEditText;
+import net.coding.program.compatible.CodingCompat;
+import net.coding.program.login.PhoneRegisterActivity_;
+import net.coding.program.login.auth.AuthInfo;
+import net.coding.program.login.auth.TotpClock;
+import net.coding.program.login.phone.EnterpriseEmailSetPasswordActivity_;
+import net.coding.program.model.AccountInfo;
+import net.coding.program.model.UserObject;
+import net.coding.program.third.FastBlur;
+
+import org.androidannotations.annotations.AfterViews;
+import org.androidannotations.annotations.Click;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.Extra;
+import org.androidannotations.annotations.OnActivityResult;
+import org.androidannotations.annotations.ViewById;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.Calendar;
+
+import cz.msebera.android.httpclient.Header;
+
+@EActivity(R.layout.enterprise_activity_login)
+public class EnterpriseLoginActivity extends BaseActivity {
+
+ public static final String EXTRA_BACKGROUND = "background";
+ public static String HOST_USER = Global.HOST_API + "/user/key/%s";
+ private static String HOST_NEED_CAPTCHA = Global.HOST_API + "/captcha/login";
+ final float radius = 8;
+ final double scaleFactor = 16;
+ private final String TAG_LOGIN = "TAG_LOGIN";
+ final String HOST_USER_NEED_2FA = Global.HOST_API + "/check_two_factor_auth_code";
+ final private int RESULT_CLOSE = 100;
+
+ @Extra
+ Uri background;
+
+ @ViewById
+ LoginEditText enterpriseEdit;
+
+ @ViewById
+ ImageView imageValify;
+ @ViewById
+ LoginEditText editName, editPassword;
+
+ @ViewById
+ EditText editValify, edit2FA;
+ @ViewById
+ View captchaLayout, loginButton, layout2fa, loginLayout, layoutRoot;
+
+ @ViewById
+ TextView loginFail;
+
+ private int clickIconCount = 0;
+ private long lastClickTime = 0;
+
+ DisplayImageOptions options = new DisplayImageOptions.Builder()
+ .showImageForEmptyUri(R.drawable.icon_user_monkey)
+ .showImageOnFail(R.drawable.icon_user_monkey)
+ .resetViewBeforeLoading(true)
+ .cacheOnDisk(true)
+ .imageScaleType(ImageScaleType.EXACTLY)
+ .bitmapConfig(Bitmap.Config.RGB_565)
+ .considerExifParams(true)
+ .displayer(new FadeInBitmapDisplayer(300))
+ .build();
+ View androidContent;
+ TextWatcher textWatcher = new SimpleTextWatcher() {
+ @Override
+ public void afterTextChanged(Editable s) {
+ upateLoginButton();
+ }
+ };
+ private String globalKey = "";
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ // 调用下，防止收到上次登录账号的通知
+ XGPushManager.registerPush(this, "*");
+ }
+
+ @AfterViews
+ void init() {
+ needCaptcha();
+
+ editName.addTextChangedListener(textWatcher);
+ editPassword.addTextChangedListener(textWatcher);
+ editValify.addTextChangedListener(textWatcher);
+ upateLoginButton();
+
+ androidContent = findViewById(android.R.id.content);
+
+ String lastLoginName = AccountInfo.loadLastLoginName(this);
+ if (!lastLoginName.isEmpty()) {
+// editName.setDisableAuto(true);
+ editName.setText(lastLoginName);
+// editName.setDisableAuto(false);
+ editPassword.requestFocus();
+ }
+
+ loginFail.setText(Global.createBlueHtml("忘记密码？", "找回密码", ""));
+ }
+
+ @Click
+ void userIcon() {
+ long clickTime = Calendar.getInstance().getTimeInMillis();
+ long lastTemp = lastClickTime;
+ lastClickTime = clickTime;
+ if (clickTime - lastTemp < 1000) {
+ ++clickIconCount;
+ } else {
+ clickIconCount = 1;
+ }
+
+ if (clickIconCount >= 5) {
+ clickIconCount = 0;
+
+ AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ View content = getLayoutInflater().inflate(R.layout.host_setting, null);
+ final EditText editText = (EditText) content.findViewById(R.id.edit);
+ final EditText editCode = (EditText) content.findViewById(R.id.editCode);
+ AccountInfo.CustomHost customHost = AccountInfo.getCustomHost(this);
+ editText.setText(customHost.getHost());
+ editCode.setText(customHost.getCode());
+ editText.setHint(Global.DEFAULT_HOST);
+ builder.setView(content)
+ .setPositiveButton(R.string.action_ok, (dialog, which) -> {
+ String hostString = editText.getText().toString();
+ String hostCode = editCode.getText().toString();
+ AccountInfo.CustomHost customHost1 = new AccountInfo.CustomHost(hostString, hostCode);
+ if (!hostString.isEmpty()) {
+ AccountInfo.saveCustomHost(this, customHost1);
+ } else {
+ AccountInfo.removeCustomHost(this);
+ }
+
+ AccountInfo.loginOut(this);
+ setResult(RESULT_OK);
+ finish();
+ })
+ .setNegativeButton(R.string.action_cancel, null)
+ .show();
+ }
+ }
+
+ private BitmapDrawable createBlur(int bgId) {
+ BitmapFactory.Options options = new BitmapFactory.Options();
+ options.inJustDecodeBounds = true;
+ BitmapFactory.decodeResource(getResources(), bgId, options);
+ int height = options.outHeight;
+ int width = options.outWidth;
+
+ options.outHeight = (int) (height / scaleFactor);
+ options.outWidth = (int) (width / scaleFactor);
+ options.inSampleSize = (int) (scaleFactor + 0.5);
+ options.inJustDecodeBounds = false;
+ options.inPreferredConfig = Bitmap.Config.ARGB_8888;
+ options.inMutable = true;
+
+ Bitmap bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.entrance1, options);
+ Bitmap blurBitmap = FastBlur.doBlur(bitmap, (int) radius, true);
+
+ return new BitmapDrawable(getResources(), blurBitmap);
+ }
+
+ private BitmapDrawable createBlur(Uri uri) {
+ String path = FileUtil.getPath(this, uri);
+ BitmapFactory.Options options = new BitmapFactory.Options();
+ options.inJustDecodeBounds = true;
+ BitmapFactory.decodeFile(path, options);
+ int height = options.outHeight;
+ int width = options.outWidth;
+
+ options.outHeight = (int) (height / scaleFactor);
+ options.outWidth = (int) (width / scaleFactor);
+ options.inSampleSize = (int) (scaleFactor + 0.5);
+ options.inJustDecodeBounds = false;
+ options.inPreferredConfig = Bitmap.Config.ARGB_8888;
+ options.inMutable = true;
+
+ Bitmap bitmap = BitmapFactory.decodeFile(path, options);
+
+ Bitmap blurBitmap = FastBlur.doBlur(bitmap, (int) radius, true);
+
+ return new BitmapDrawable(getResources(), blurBitmap);
+ }
+
+ @Click
+ void imageValify() {
+ editValify.requestFocus();
+ downloadValifyPhoto();
+ }
+
+ @Click
+ void register() {
+ Global.popSoftkeyboard(this, editName, false);
+ PhoneRegisterActivity_.intent(this)
+ .startForResult(RESULT_CLOSE);
+ }
+
+ @OnActivityResult(RESULT_CLOSE)
+ void resultRegiter(int result) {
+ if (result == Activity.RESULT_OK) {
+ sendBroadcast(new Intent(GuideActivity.BROADCAST_GUIDE_ACTIVITY));
+ finish();
+ }
+ }
+
+ private void needCaptcha() {
+ getNetwork(HOST_NEED_CAPTCHA, HOST_NEED_CAPTCHA);
+ }
+
+ private void downloadValifyPhoto() {
+ String host = Global.HOST_API + "/getCaptcha";
+ AsyncHttpClient client = MyAsyncHttpClient.createClient(this);
+
+ client.get(host, new AsyncHttpResponseHandler() {
+ @Override
+ public void onSuccess(int statusCode, Header[] headers, byte[] responseBody) {
+ imageValify.setImageBitmap(BitmapFactory.decodeByteArray(responseBody, 0, responseBody.length));
+ editValify.setText("");
+ }
+
+ @Override
+ public void onFailure(int statusCode, Header[] headers, byte[] responseBody, Throwable error) {
+ showMiddleToast("获取验证码失败");
+ }
+ });
+ }
+
+ @Click
+ protected final void loginButton() {
+ if (layout2fa.getVisibility() == View.GONE) {
+ login();
+ } else {
+ login2fa();
+ }
+ }
+
+ private void login2fa() {
+ String input = edit2FA.getText().toString();
+ if (input.isEmpty()) {
+ showMiddleToast("请输入身份验证器中的验证码");
+ return;
+ }
+
+ RequestParams params = new RequestParams();
+ params.put("code", input);
+ postNetwork(HOST_USER_NEED_2FA, params, HOST_USER_NEED_2FA);
+ showProgressBar(true, "登录中");
+
+ Global.popSoftkeyboard(this, edit2FA, false);
+ }
+
+ private void login() {
+ try {
+ String name = editName.getText().toString();
+ String password = editPassword.getText().toString();
+ String captcha = editValify.getText().toString();
+
+ if (name.isEmpty()) {
+ showMiddleToast("邮箱或用户名不能为空");
+ return;
+ }
+
+ if (password.isEmpty()) {
+ showMiddleToast("密码不能为空");
+ return;
+ }
+
+ RequestParams params = new RequestParams();
+
+ params.put("password", SimpleSHA1.sha1(password));
+ if (captchaLayout.getVisibility() == View.VISIBLE) {
+ params.put("j_captcha", captcha);
+ }
+ params.put("remember_me", true);
+
+ String HOST_LOGIN = Global.HOST_API + "/v2/account/login";
+ params.put("account", name);
+
+ postNetwork(HOST_LOGIN, params, TAG_LOGIN);
+ showProgressBar(true, R.string.logining);
+
+ Global.popSoftkeyboard(this, editName, false);
+
+ } catch (Exception e) {
+ Global.errorLog(e);
+ }
+ }
+
+ @Click
+ protected final void loginFail() {
+ String account = editName.getText().toString();
+ if (!InputCheck.isPhone(account) && !InputCheck.isEmail(account)) {
+ account = "";
+ }
+
+ EnterpriseEmailSetPasswordActivity_.intent(this)
+ .enterpriseName(enterpriseEdit.getTextString())
+ .account(account)
+ .start();
+ }
+
+ @Click
+ protected final void login_2fa() {
+ Global.start2FAActivity(this);
+ }
+
+ private void show2FA(boolean show) {
+ if (show) {
+ layout2fa.setVisibility(View.VISIBLE);
+ loginLayout.setVisibility(View.GONE);
+ String uri = AccountInfo.loadAuth(this, globalKey);
+ if (!uri.isEmpty()) {
+ String code2FA = new AuthInfo(uri, new TotpClock(this)).getCode();
+ edit2FA.getText().insert(0, code2FA);
+ loginButton();
+ }
+
+ } else {
+ layout2fa.setVisibility(View.GONE);
+ loginLayout.setVisibility(View.VISIBLE);
+ }
+ }
+
+ @Override
+ public void parseJson(int code, JSONObject respanse, String tag, int pos, Object data) throws JSONException {
+ if (tag.equals(TAG_LOGIN)) {
+ if (code == 0) {
+ EnterpriseMainActivity_.setNeedWarnEmailNoValidLogin();
+ loginSuccess(respanse);
+ umengEvent(UmengEvent.USER, "普通登录");
+ } else if (code == 3205) {
+ EnterpriseMainActivity_.setNeedWarnEmailNoValidLogin();
+ umengEvent(UmengEvent.USER, "2fa登录");
+ globalKey = respanse.optJSONObject("msg").optString("two_factor_auth_code_not_empty", "");
+ show2FA(true);
+ showProgressBar(false);
+
+ } else {
+ loginFail(code, respanse, true);
+ }
+
+ } else if (tag.equals(HOST_USER_NEED_2FA)) {
+ if (code == 0) {
+ loginSuccess(respanse);
+ } else {
+ loginFail(code, respanse, false);
+ }
+ } else if (tag.equals(HOST_USER)) {
+ if (code == 0) {
+ showProgressBar(false);
+ UserObject user = new UserObject(respanse.getJSONObject("data"));
+ AccountInfo.saveAccount(this, user);
+ MyAppEnterprise.sUserObject = user;
+ AccountInfo.saveReloginInfo(this, user);
+
+ Global.syncCookie(this);
+
+ String name = editName.getText().toString();
+ AccountInfo.saveLastLoginName(this, name);
+
+ sendBroadcast(new Intent(GuideActivity.BROADCAST_GUIDE_ACTIVITY));
+ finish();
+ startActivity(new Intent(this, CodingCompat.instance().getMainActivity()));
+ } else {
+ showProgressBar(false);
+ showErrorMsg(code, respanse);
+ }
+
+ } else if (tag.equals(HOST_NEED_CAPTCHA)) {
+ if (code == 0) {
+ if (respanse.getBoolean("data")) {
+ captchaLayout.setVisibility(View.VISIBLE);
+ downloadValifyPhoto();
+ }
+ } else {
+ showErrorMsg(code, respanse);
+ }
+ }
+ }
+
+ private void loginFail(int code, JSONObject respanse, boolean needCaptcha) {
+ String msg = Global.getErrorMsg(respanse).replaceAll("(.*?)", "\n$1");
+ showMiddleToast(msg);
+ showProgressBar(false);
+ if (code != NetworkImpl.NETWORK_ERROR &&
+ code != NetworkImpl.NETWORK_ERROR_SERVICE &&
+ needCaptcha) {
+ needCaptcha();
+ }
+ }
+
+ private void loginSuccess(JSONObject respanse) throws JSONException {
+ UserObject user = new UserObject(respanse.getJSONObject("data"));
+ getNetwork(String.format(HOST_USER, user.global_key), HOST_USER);
+ showProgressBar(true, R.string.logining);
+ }
+
+ @Override
+ public void onBackPressed() {
+ if (layout2fa.getVisibility() == View.GONE) {
+ finish();
+ } else {
+ show2FA(false);
+ }
+ }
+
+ private void upateLoginButton() {
+ if (editName.getText().length() == 0) {
+ loginButton.setEnabled(false);
+ return;
+ }
+
+ if (editPassword.getText().length() == 0) {
+ loginButton.setEnabled(false);
+ return;
+ }
+
+ if (captchaLayout.getVisibility() == View.VISIBLE &&
+ editValify.getText().length() == 0) {
+ loginButton.setEnabled(false);
+ return;
+ }
+
+ loginButton.setEnabled(true);
+ }
+}
\ No newline at end of file
diff --git a/app/src/enterprise/res/layout/enterprise_activity_email_set_password.xml b/app/src/enterprise/res/layout/enterprise_activity_email_set_password.xml
new file mode 100644
index 000000000..20bb87dbe
--- /dev/null
+++ b/app/src/enterprise/res/layout/enterprise_activity_email_set_password.xml
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/enterprise/res/layout/enterprise_activity_login.xml b/app/src/enterprise/res/layout/enterprise_activity_login.xml
new file mode 100755
index 000000000..a04fcee96
--- /dev/null
+++ b/app/src/enterprise/res/layout/enterprise_activity_login.xml
@@ -0,0 +1,242 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/java/net/coding/program/common/Global.java b/app/src/main/java/net/coding/program/common/Global.java
index a286b24f4..de569f5dd 100644
--- a/app/src/main/java/net/coding/program/common/Global.java
+++ b/app/src/main/java/net/coding/program/common/Global.java
@@ -16,6 +16,7 @@
import android.text.Editable;
import android.text.Html;
import android.text.Spannable;
+import android.text.Spanned;
import android.text.style.ImageSpan;
import android.text.style.QuoteSpan;
import android.text.style.URLSpan;
@@ -126,6 +127,13 @@ public static String makeLogTag(String str) {
return LOG_PREFIX + str;
}
+ public static Spanned createBlueHtml(String begin, String middle, String end) {
+ return createColorHtml(begin, middle, end, "#4F95E8");
+ }
+
+ public static Spanned createColorHtml(String begin, String middle, String end, String color) {
+ return Html.fromHtml(String.format("%s%s%s", begin, color, middle, end));
+ }
public static String getExtraString(Context context) {
String FEED_EXTRA = "";
diff --git a/app/src/main/res/layout/activity_base_send_email.xml b/app/src/main/res/layout/activity_base_send_email.xml
index a391adfc0..74de2bec0 100644
--- a/app/src/main/res/layout/activity_base_send_email.xml
+++ b/app/src/main/res/layout/activity_base_send_email.xml
@@ -16,7 +16,7 @@
-
+
diff --git a/app/src/main/res/layout/activity_email_register.xml b/app/src/main/res/layout/activity_email_register.xml
index c69891e9c..05b2784e0 100644
--- a/app/src/main/res/layout/activity_email_register.xml
+++ b/app/src/main/res/layout/activity_email_register.xml
@@ -59,7 +59,7 @@
-
+
-
+
+ app:layout_behavior="@string/appbar_scrolling_view_behavior" />
\ No newline at end of file
From ec4144342376817c4eb1079d926cf3df0c8bad6e Mon Sep 17 00:00:00 2001
From: 8206503 <8206503@qq.com>
Date: Thu, 5 Jan 2017 20:54:20 +0800
Subject: [PATCH 022/898] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=BB=96=E4=BA=BA?=
=?UTF-8?q?=E7=9A=84=E4=B8=BB=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/enterprise/AndroidManifest.xml | 5 ++
.../compatible/EnterpriseCompatImp.java | 16 ++++++
.../user/EnterpriseUserDetailActivity.java | 14 +++++
.../net/coding/program/common/Global.java | 8 +++
.../common/htmltext/URLSpanNoUnderline.java | 5 +-
.../program/common/ui/BaseActivity.java | 14 ++---
.../program/common/ui/BaseFragment.java | 7 +--
.../compatible/ClassCompatInterface.java | 4 ++
.../program/compatible/CodingCompat.java | 17 ++++++
.../program/compatible/DefaultCompatImp.java | 16 ++++++
.../program/maopao/LikeUsersListActivity.java | 14 ++---
.../project/DateSectionDynamicAdapter.java | 55 +++++--------------
.../project/detail/MembersListFragment.java | 7 +--
.../project/detail/TopicListFragment.java | 10 +---
.../detail/merge/MergeDetailActivity.java | 11 +---
.../merge/MergeReviewerListFragment.java | 6 +-
.../project/git/ForksListActivity.java | 11 +---
.../program/search/SearchUserFragment.java | 5 +-
.../program/subject/SubjectUserFragment.java | 4 +-
.../program/user/AddFollowActivity.java | 7 +--
.../program/user/UsersListActivity.java | 6 +-
.../user/team/TeamMemberListActivity.java | 10 ++--
22 files changed, 133 insertions(+), 119 deletions(-)
create mode 100644 app/src/enterprise/java/net/coding/program/user/EnterpriseUserDetailActivity.java
diff --git a/app/src/enterprise/AndroidManifest.xml b/app/src/enterprise/AndroidManifest.xml
index 03be628b8..58be1ba80 100755
--- a/app/src/enterprise/AndroidManifest.xml
+++ b/app/src/enterprise/AndroidManifest.xml
@@ -460,6 +460,11 @@
android:icon="@drawable/ic_lancher"
android:label="@string/title_activity_add_follow"
android:screenOrientation="portrait" />
+
{
+ String globalKey = (String) v.getTag();
+ UserDetailActivity_.intent(v.getContext())
+ .globalKey(globalKey)
+ .start();
+ };
}
diff --git a/app/src/main/java/net/coding/program/common/htmltext/URLSpanNoUnderline.java b/app/src/main/java/net/coding/program/common/htmltext/URLSpanNoUnderline.java
index 9bdbfdefc..cc6481f8a 100644
--- a/app/src/main/java/net/coding/program/common/htmltext/URLSpanNoUnderline.java
+++ b/app/src/main/java/net/coding/program/common/htmltext/URLSpanNoUnderline.java
@@ -14,6 +14,7 @@
import net.coding.program.WebActivity_;
import net.coding.program.common.Global;
import net.coding.program.common.push.PushUrl;
+import net.coding.program.compatible.CodingCompat;
import net.coding.program.login.auth.AuthListActivity;
import net.coding.program.maopao.MaopaoDetailActivity;
import net.coding.program.maopao.MaopaoDetailActivity_;
@@ -120,9 +121,7 @@ public static boolean openActivityByUri(Context context, String uri, boolean new
matcher = pattern.matcher(uriString);
if (matcher.find()) {
String global = matcher.group(1);
- intent.setClass(context, UserDetailActivity_.class);
- intent.putExtra("globalKey", global);
- context.startActivity(intent);
+ CodingCompat.instance().launchUserDetailActivity(context, global);
return true;
}
diff --git a/app/src/main/java/net/coding/program/common/ui/BaseActivity.java b/app/src/main/java/net/coding/program/common/ui/BaseActivity.java
index 76aee6bea..8a32c83df 100755
--- a/app/src/main/java/net/coding/program/common/ui/BaseActivity.java
+++ b/app/src/main/java/net/coding/program/common/ui/BaseActivity.java
@@ -27,8 +27,8 @@
import net.coding.program.common.network.NetworkImpl;
import net.coding.program.common.umeng.UmengActivity;
import net.coding.program.common.util.SingleToast;
+import net.coding.program.compatible.CodingCompat;
import net.coding.program.model.RequestData;
-import net.coding.program.user.UserDetailActivity_;
import org.json.JSONException;
import org.json.JSONObject;
@@ -41,15 +41,9 @@ public class BaseActivity extends UmengActivity implements NetworkCallback, Star
protected LayoutInflater mInflater;
protected FootUpdate mFootUpdate = new FootUpdate();
- protected View.OnClickListener mOnClickUser = new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- String globalKey = (String) v.getTag();
-
- UserDetailActivity_.intent(BaseActivity.this)
- .globalKey(globalKey)
- .start();
- }
+ protected View.OnClickListener mOnClickUser = v -> {
+ String globalKey = (String) v.getTag();
+ CodingCompat.instance().launchUserDetailActivity(BaseActivity.this, globalKey);
};
SingleToast mSingleToast;
diff --git a/app/src/main/java/net/coding/program/common/ui/BaseFragment.java b/app/src/main/java/net/coding/program/common/ui/BaseFragment.java
index 08a5f1867..6a3559c5e 100755
--- a/app/src/main/java/net/coding/program/common/ui/BaseFragment.java
+++ b/app/src/main/java/net/coding/program/common/ui/BaseFragment.java
@@ -3,7 +3,6 @@
import android.app.Activity;
import android.app.ProgressDialog;
import android.content.DialogInterface;
-import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.support.design.widget.AppBarLayout;
@@ -31,7 +30,7 @@
import net.coding.program.common.network.NetworkImpl;
import net.coding.program.common.network.UmengFragment;
import net.coding.program.common.util.SingleToast;
-import net.coding.program.user.UserDetailActivity_;
+import net.coding.program.compatible.CodingCompat;
import org.json.JSONException;
import org.json.JSONObject;
@@ -49,9 +48,7 @@ public class BaseFragment extends UmengFragment implements NetworkCallback, Foot
protected View.OnClickListener mOnClickUser = v -> {
String globalKey = (String) v.getTag();
- Intent intent = new Intent(getActivity(), UserDetailActivity_.class);
- intent.putExtra("globalKey", globalKey);
- startActivity(intent);
+ CodingCompat.instance().launchUserDetailActivity(getActivity(), globalKey);
};
private ImageLoadTool imageLoadTool = new ImageLoadTool();
diff --git a/app/src/main/java/net/coding/program/compatible/ClassCompatInterface.java b/app/src/main/java/net/coding/program/compatible/ClassCompatInterface.java
index 600bd8d75..3e8d58195 100644
--- a/app/src/main/java/net/coding/program/compatible/ClassCompatInterface.java
+++ b/app/src/main/java/net/coding/program/compatible/ClassCompatInterface.java
@@ -24,4 +24,8 @@ public interface ClassCompatInterface {
void launchMyDetailActivity(Context context);
+ void launchUserDetailActivity(Context context, String globalKey);
+ void launchUserDetailActivity(Context context, String globalKey, int result);
+ void launchUserDetailActivity(Fragment fragment, String globalKey, int result);
+
}
diff --git a/app/src/main/java/net/coding/program/compatible/CodingCompat.java b/app/src/main/java/net/coding/program/compatible/CodingCompat.java
index 64533be21..9aa5f105e 100644
--- a/app/src/main/java/net/coding/program/compatible/CodingCompat.java
+++ b/app/src/main/java/net/coding/program/compatible/CodingCompat.java
@@ -7,6 +7,7 @@
/**
* Created by chenchao on 2016/12/28.
+ * 实现同 coding 普通版有差异的地方
*/
public class CodingCompat implements ClassCompatInterface {
@@ -52,4 +53,20 @@ public Class getLoginActivity() {
public void launchMyDetailActivity(Context context) {
substance.launchMyDetailActivity(context);
}
+
+ @Override
+ public void launchUserDetailActivity(Context context, String globalKey) {
+ substance.launchUserDetailActivity(context, globalKey);
+ }
+
+ @Override
+ public void launchUserDetailActivity(Context context, String globalKey, int result) {
+ substance.launchUserDetailActivity(context, globalKey, result);
+ }
+
+ @Override
+ public void launchUserDetailActivity(Fragment fragment, String globalKey, int result) {
+ substance.launchUserDetailActivity(fragment, globalKey, result);
+ }
}
+
diff --git a/app/src/main/java/net/coding/program/compatible/DefaultCompatImp.java b/app/src/main/java/net/coding/program/compatible/DefaultCompatImp.java
index 9d5b1a56f..79d4f21f7 100644
--- a/app/src/main/java/net/coding/program/compatible/DefaultCompatImp.java
+++ b/app/src/main/java/net/coding/program/compatible/DefaultCompatImp.java
@@ -11,6 +11,7 @@
import net.coding.program.project.PrivateProjectHomeFragment_;
import net.coding.program.project.PublicProjectHomeFragment_;
import net.coding.program.user.MyDetailActivity_;
+import net.coding.program.user.UserDetailActivity_;
/**
* Created by chenchao on 2016/12/29.
@@ -58,4 +59,19 @@ public Class getLoginActivity() {
public void launchMyDetailActivity(Context context) {
MyDetailActivity_.intent(context).start();
}
+
+ @Override
+ public void launchUserDetailActivity(Context context, String globalKey) {
+ UserDetailActivity_.intent(context).globalKey(globalKey).start();
+ }
+
+ @Override
+ public void launchUserDetailActivity(Context context, String globalKey, int result) {
+ UserDetailActivity_.intent(context).globalKey(globalKey).startForResult(result);
+ }
+
+ @Override
+ public void launchUserDetailActivity(Fragment fragment, String globalKey, int result) {
+ UserDetailActivity_.intent(fragment).globalKey(globalKey).startForResult(result);
+ }
}
diff --git a/app/src/main/java/net/coding/program/maopao/LikeUsersListActivity.java b/app/src/main/java/net/coding/program/maopao/LikeUsersListActivity.java
index d58ede683..116153b36 100755
--- a/app/src/main/java/net/coding/program/maopao/LikeUsersListActivity.java
+++ b/app/src/main/java/net/coding/program/maopao/LikeUsersListActivity.java
@@ -1,9 +1,7 @@
package net.coding.program.maopao;
-import android.content.Intent;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.AdapterView;
import android.widget.BaseAdapter;
import android.widget.CheckBox;
import android.widget.ImageView;
@@ -16,10 +14,10 @@
import net.coding.program.R;
import net.coding.program.common.Global;
import net.coding.program.common.ui.BackActivity;
+import net.coding.program.compatible.CodingCompat;
import net.coding.program.model.DynamicObject;
import net.coding.program.model.Maopao;
import net.coding.program.user.UserDetailActivity;
-import net.coding.program.user.UserDetailActivity_;
import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.EActivity;
@@ -117,13 +115,9 @@ protected final void initLikeUsersListActivity() {
UriLikeUsers = String.format(UriLikeUsers, id);
listView.setAdapter(baseAdapter);
- listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
- @Override
- public void onItemClick(AdapterView parent, View view, int position, long id) {
- Intent intent = new Intent(LikeUsersListActivity.this, UserDetailActivity_.class);
- intent.putExtra("globalKey", mData.get((int) id).global_key);
- startActivity(intent);
- }
+ listView.setOnItemClickListener((parent, view, position, id1) -> {
+ CodingCompat.instance().launchUserDetailActivity(LikeUsersListActivity.this,
+ mData.get((int) id1).global_key);
});
getNetwork(UriLikeUsers, UriLikeUsers);
diff --git a/app/src/main/java/net/coding/program/project/DateSectionDynamicAdapter.java b/app/src/main/java/net/coding/program/project/DateSectionDynamicAdapter.java
index eeed7be32..c1d1b2b68 100644
--- a/app/src/main/java/net/coding/program/project/DateSectionDynamicAdapter.java
+++ b/app/src/main/java/net/coding/program/project/DateSectionDynamicAdapter.java
@@ -1,20 +1,16 @@
package net.coding.program.project;
-import android.app.Activity;
import android.content.Context;
-import android.content.Intent;
import android.text.Spanned;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.BaseAdapter;
import android.widget.ImageView;
import android.widget.SectionIndexer;
import android.widget.TextView;
import net.coding.program.FootUpdate;
import net.coding.program.R;
-import net.coding.program.common.ClickSmallImage;
import net.coding.program.common.Global;
import net.coding.program.common.ImageLoadTool;
import net.coding.program.common.LongClickLinkMovementMethod;
@@ -23,9 +19,7 @@
import net.coding.program.common.network.RefreshBaseFragment;
import net.coding.program.common.widget.DataAdapter;
import net.coding.program.login.auth.Utilities;
-import net.coding.program.maopao.item.ContentAreaMuchImages;
import net.coding.program.model.DynamicObject;
-import net.coding.program.user.UserDetailActivity_;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -44,46 +38,24 @@ public class DateSectionDynamicAdapter {
+ String s = (String) v.getTag();
+ if (s.isEmpty()) {
+ return;
}
+
+ URLSpanNoUnderline.openActivityByUri(v.getContext(), s, false);
};
+ private View.OnClickListener onClickParent = v -> ((ViewGroup) v.getParent()).callOnClick();
private ArrayList mSectionTitle = new ArrayList<>();
private ArrayList mSectionId = new ArrayList<>();
public DateSectionDynamicAdapter(Context context, MyImageGetter imageGetter, FootUpdate.LoadMore loader) {
- mContext = context;
mInflater = LayoutInflater.from(context);
mImageLoader = new ImageLoadTool();
myImageGetter = imageGetter;
@@ -212,7 +184,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
}
if (holder.mIcon != null) {
- holder.mIcon.setOnClickListener(mOnClickUser);
+ holder.mIcon.setOnClickListener(Global.clickUser);
mImageLoader.loadImage(holder.mIcon, data.user.avatar);
holder.mIcon.setTag(data.user.global_key);
}
@@ -293,7 +265,7 @@ public void notifyDataSetChanged() {
super.notifyDataSetChanged();
}
- class HeaderViewHolder {
+ private class HeaderViewHolder {
TextView mHead;
}
@@ -317,8 +289,7 @@ public void setDynamics(ArrayList data) {
super.setData(data);
}
-
- protected int getListSectionResourceId() {
+ private int getListSectionResourceId() {
return R.layout.fragment_project_dynamic_list_head;
}
diff --git a/app/src/main/java/net/coding/program/project/detail/MembersListFragment.java b/app/src/main/java/net/coding/program/project/detail/MembersListFragment.java
index 23bbda85e..b5de671ca 100755
--- a/app/src/main/java/net/coding/program/project/detail/MembersListFragment.java
+++ b/app/src/main/java/net/coding/program/project/detail/MembersListFragment.java
@@ -26,13 +26,13 @@
import net.coding.program.common.base.MyJsonResponse;
import net.coding.program.common.network.MyAsyncHttpClient;
import net.coding.program.common.umeng.UmengEvent;
+import net.coding.program.compatible.CodingCompat;
import net.coding.program.model.ProjectObject;
import net.coding.program.model.TaskObject;
import net.coding.program.model.UserObject;
import net.coding.program.project.ProjectFragment;
import net.coding.program.project.ProjectHomeActivity;
import net.coding.program.user.AddFollowActivity_;
-import net.coding.program.user.UserDetailActivity_;
import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.EFragment;
@@ -214,9 +214,8 @@ public void listViewItemClicked(Object object) {
getActivity().finish();
} else if (dataType == DataType.User) {
if (object instanceof UserObject) {
- UserDetailActivity_.intent(this)
- .globalKey(((UserObject) object).global_key)
- .start();
+ String globalKey = ((UserObject) object).global_key;
+ CodingCompat.instance().launchUserDetailActivity(getActivity(), globalKey);
}
} else {
UserDynamicActivity_
diff --git a/app/src/main/java/net/coding/program/project/detail/TopicListFragment.java b/app/src/main/java/net/coding/program/project/detail/TopicListFragment.java
index 21814f052..b67cfad85 100755
--- a/app/src/main/java/net/coding/program/project/detail/TopicListFragment.java
+++ b/app/src/main/java/net/coding/program/project/detail/TopicListFragment.java
@@ -24,7 +24,6 @@
import net.coding.program.model.ProjectObject;
import net.coding.program.model.TopicObject;
import net.coding.program.project.detail.topic.TopicListDetailActivity_;
-import net.coding.program.user.UserDetailActivity_;
import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.Click;
@@ -80,12 +79,7 @@ public class TopicListFragment extends CustomMoreFragment implements FootUpdate.
View blankLayout;
@AnimationRes
Animation dropdown_in, dropdown_out, dropdown_mask_out;
- View.OnClickListener onClickUser = v -> {
- String globaKey = (String) v.getTag();
- Intent intent = new Intent(getActivity(), UserDetailActivity_.class);
- intent.putExtra("globalKey", globaKey);
- startActivity(intent);
- };
+
private ArrayList mData = new ArrayList<>();
private String urlGet;
@@ -114,7 +108,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
convertView = mInflater.inflate(R.layout.fragment_project_topic_list_item, parent, false);
holder = new ViewHolder();
holder.icon = (ImageView) convertView.findViewById(R.id.icon);
- holder.icon.setOnClickListener(onClickUser);
+ holder.icon.setOnClickListener(Global.clickUser);
holder.title = (TextView) convertView.findViewById(R.id.title);
holder.time = (TextView) convertView.findViewById(R.id.time);
diff --git a/app/src/main/java/net/coding/program/project/detail/merge/MergeDetailActivity.java b/app/src/main/java/net/coding/program/project/detail/merge/MergeDetailActivity.java
index 434cb0b0c..2a00da76b 100644
--- a/app/src/main/java/net/coding/program/project/detail/merge/MergeDetailActivity.java
+++ b/app/src/main/java/net/coding/program/project/detail/merge/MergeDetailActivity.java
@@ -49,7 +49,6 @@
import net.coding.program.task.add.CommentHolder;
import net.coding.program.task.add.RefResourceActivity;
import net.coding.program.task.add.RefResourceActivity_;
-import net.coding.program.user.UserDetailActivity_;
import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.Click;
@@ -912,14 +911,10 @@ public void onClick(View v) {
if (reviewer.user.global_key.equals(mMerge.getAuthor().global_key)) {
continue;
}
+
CircleImageView circleImageView = new CircleImageView(this);
- circleImageView.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- UserDetailActivity_.intent(MergeDetailActivity.this)
- .globalKey(reviewer.user.global_key).start();
- }
- });
+ circleImageView.setOnClickListener(Global.clickUser);
+ circleImageView.setTag(reviewer.user.global_key);
if ("invitee".equals(reviewer.volunteer) && reviewer.value > 0) {
FrameLayout container = new FrameLayout(this);
diff --git a/app/src/main/java/net/coding/program/project/detail/merge/MergeReviewerListFragment.java b/app/src/main/java/net/coding/program/project/detail/merge/MergeReviewerListFragment.java
index 34cacf16d..4f13a5fee 100755
--- a/app/src/main/java/net/coding/program/project/detail/merge/MergeReviewerListFragment.java
+++ b/app/src/main/java/net/coding/program/project/detail/merge/MergeReviewerListFragment.java
@@ -24,11 +24,11 @@
import net.coding.program.common.BlankViewDisplay;
import net.coding.program.common.Global;
import net.coding.program.common.base.CustomMoreFragment;
+import net.coding.program.compatible.CodingCompat;
import net.coding.program.model.Merge;
import net.coding.program.model.TaskObject;
import net.coding.program.model.UserObject;
import net.coding.program.project.detail.MembersSelectActivity_;
-import net.coding.program.user.UserDetailActivity_;
import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.EFragment;
@@ -263,8 +263,8 @@ public void onItemClick(AdapterView parent, View view, int position, long id)
deleteNetwork(mMerge.getHttpReviewGood(), TAG_URL_REVIEW_BAD, reviewer);
}
} else {
- UserDetailActivity_.intent(MergeReviewerListFragment.this)
- .globalKey(reviewer.user.global_key).start();
+ CodingCompat.instance().launchUserDetailActivity(getActivity(),
+ reviewer.user.global_key);
}
}
diff --git a/app/src/main/java/net/coding/program/project/git/ForksListActivity.java b/app/src/main/java/net/coding/program/project/git/ForksListActivity.java
index 9cc333ad1..839144ba2 100644
--- a/app/src/main/java/net/coding/program/project/git/ForksListActivity.java
+++ b/app/src/main/java/net/coding/program/project/git/ForksListActivity.java
@@ -14,7 +14,6 @@
import net.coding.program.project.ProjectHomeActivity_;
import net.coding.program.project.detail.ProjectActivity;
import net.coding.program.project.init.InitProUtils;
-import net.coding.program.user.UserDetailActivity_;
import org.androidannotations.annotations.EActivity;
import org.androidannotations.annotations.Extra;
@@ -58,7 +57,7 @@ public void init(View v, ImageLoadTool imageLoadTool) {
title = (TextView) v.findViewById(R.id.name);
content = (TextView) v.findViewById(R.id.comment);
mImageTool = imageLoadTool;
- icon.setOnClickListener(mClickIcon);
+ icon.setOnClickListener(Global.clickUser);
}
public void setData(Object item) {
@@ -68,14 +67,6 @@ public void setData(Object item) {
mImageTool.loadImage(icon, data.getOwner().avatar);
icon.setTag(data.getOwner().global_key);
}
-
- View.OnClickListener mClickIcon = v -> {
- String globalKey = (String) v.getTag();
- UserDetailActivity_.intent(v.getContext())
- .globalKey(globalKey)
- .start();
- };
-
}
}
diff --git a/app/src/main/java/net/coding/program/search/SearchUserFragment.java b/app/src/main/java/net/coding/program/search/SearchUserFragment.java
index bca624fb2..83abb1e7e 100644
--- a/app/src/main/java/net/coding/program/search/SearchUserFragment.java
+++ b/app/src/main/java/net/coding/program/search/SearchUserFragment.java
@@ -9,8 +9,8 @@
import net.coding.program.common.Global;
import net.coding.program.common.adapter.SearchUserAdapter;
import net.coding.program.common.network.RefreshBaseFragment;
+import net.coding.program.compatible.CodingCompat;
import net.coding.program.model.UserObject;
-import net.coding.program.user.UserDetailActivity_;
import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.EFragment;
@@ -57,7 +57,8 @@ protected void init() {
@ItemClick
final void listView(UserObject itemData) {
- UserDetailActivity_.intent(this).globalKey(itemData.global_key.replace("", "").replace("", "")).start();
+ String globalKey = itemData.global_key.replace("", "").replace("", "");
+ CodingCompat.instance().launchUserDetailActivity(getActivity(), globalKey);
}
AbsListView.OnScrollListener mOnScrollListener = new AbsListView.OnScrollListener() {
diff --git a/app/src/main/java/net/coding/program/subject/SubjectUserFragment.java b/app/src/main/java/net/coding/program/subject/SubjectUserFragment.java
index d2ae86e03..13cb11cdf 100644
--- a/app/src/main/java/net/coding/program/subject/SubjectUserFragment.java
+++ b/app/src/main/java/net/coding/program/subject/SubjectUserFragment.java
@@ -13,9 +13,9 @@
import net.coding.program.R;
import net.coding.program.common.Global;
import net.coding.program.common.network.RefreshBaseFragment;
+import net.coding.program.compatible.CodingCompat;
import net.coding.program.model.UserObject;
import net.coding.program.subject.adapter.SubjectUserListAdapter;
-import net.coding.program.user.UserDetailActivity_;
import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.EFragment;
@@ -91,7 +91,7 @@ public void onRefresh() {
@ItemClick
final void listView(UserObject itemData) {
- UserDetailActivity_.intent(this).globalKey(itemData.global_key).startForResult(RESULT_USER_DETAIL);
+ CodingCompat.instance().launchUserDetailActivity(this, itemData.global_key, RESULT_USER_DETAIL);
}
@OnActivityResult(RESULT_USER_DETAIL)
diff --git a/app/src/main/java/net/coding/program/user/AddFollowActivity.java b/app/src/main/java/net/coding/program/user/AddFollowActivity.java
index 86774680b..6f5974019 100755
--- a/app/src/main/java/net/coding/program/user/AddFollowActivity.java
+++ b/app/src/main/java/net/coding/program/user/AddFollowActivity.java
@@ -27,6 +27,7 @@
import net.coding.program.common.WeakRefHander;
import net.coding.program.common.ui.BackActivity;
import net.coding.program.common.umeng.UmengEvent;
+import net.coding.program.compatible.CodingCompat;
import net.coding.program.model.ProjectObject;
import net.coding.program.model.UserObject;
import net.coding.program.model.project.ProjectServiceInfo;
@@ -89,10 +90,8 @@ protected final void initAddFollowActivity() {
baseAdapter = new FollowAdapter(this, true, mData);
listView.setOnItemClickListener((parent, view, position, id) -> {
UserObject userObject = mData.get((int) id);
- UserDetailActivity_
- .intent(AddFollowActivity.this)
- .globalKey(userObject.global_key)
- .startForResult(RESULT_USER_DETAIL);
+ CodingCompat.instance().launchUserDetailActivity(this, userObject.global_key,
+ RESULT_USER_DETAIL);
});
} else {
urlAddUser = Global.HOST_API + mProjectObject.getProjectPath() + "/members/gk/add";
diff --git a/app/src/main/java/net/coding/program/user/UsersListActivity.java b/app/src/main/java/net/coding/program/user/UsersListActivity.java
index 4af348730..32f8bd2ef 100755
--- a/app/src/main/java/net/coding/program/user/UsersListActivity.java
+++ b/app/src/main/java/net/coding/program/user/UsersListActivity.java
@@ -26,6 +26,7 @@
import net.coding.program.common.HtmlContent;
import net.coding.program.common.ui.BackActivity;
import net.coding.program.common.umeng.UmengEvent;
+import net.coding.program.compatible.CodingCompat;
import net.coding.program.message.MessageListActivity;
import net.coding.program.model.AccountInfo;
import net.coding.program.model.ProjectObject;
@@ -209,9 +210,8 @@ protected final void initUsersListActivity() {
} else {
listView.setOnItemClickListener((parent, view, position, id) -> {
String globalKey = ((UserObject) parent.getItemAtPosition(position)).global_key;
- UserDetailActivity_.intent(UsersListActivity.this)
- .globalKey(globalKey)
- .startForResult(RESULT_REQUEST_DETAIL);
+ CodingCompat.instance().launchUserDetailActivity(this,
+ globalKey, RESULT_REQUEST_DETAIL);
});
}
}
diff --git a/app/src/main/java/net/coding/program/user/team/TeamMemberListActivity.java b/app/src/main/java/net/coding/program/user/team/TeamMemberListActivity.java
index eb5c46439..7954c55f6 100644
--- a/app/src/main/java/net/coding/program/user/team/TeamMemberListActivity.java
+++ b/app/src/main/java/net/coding/program/user/team/TeamMemberListActivity.java
@@ -1,15 +1,17 @@
package net.coding.program.user.team;
import android.view.View;
-import android.widget.*;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
import net.coding.program.R;
import net.coding.program.common.Global;
import net.coding.program.common.ui.BackActivity;
+import net.coding.program.compatible.CodingCompat;
import net.coding.program.model.TaskObject;
import net.coding.program.model.team.TeamListObject;
import net.coding.program.model.team.TeamMember;
-import net.coding.program.user.UserDetailActivity_;
import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.EActivity;
@@ -42,9 +44,7 @@ void initTeamMemberListAcitvity() {
listView.setAdapter(listAdapter);
listView.setOnItemClickListener(((parent, view, position, id) -> {
TeamMember teamMember = (TeamMember) listAdapter.getItem((int) id);
- UserDetailActivity_.intent(TeamMemberListActivity.this)
- .globalKey(teamMember.user.global_key)
- .start();
+ CodingCompat.instance().launchUserDetailActivity(this, teamMember.user.global_key);
}));
final String url = String.format("%s/team/%s/members", Global.HOST_API, teamListObject.globalkey);
From 3e3efaffaff9afa74cf110747c1be326350879b7 Mon Sep 17 00:00:00 2001
From: 8206503 <8206503@qq.com>
Date: Thu, 5 Jan 2017 21:46:23 +0800
Subject: [PATCH 023/898] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BB=96=E4=BA=BA?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../program/user/EnterpriseLoginActivity.java | 2 +-
.../user/EnterpriseMyDetailActivity.java | 7 +-
.../user/EnterpriseUserDetailActivity.java | 72 ++++++++++++++++++-
.../res/layout/enterprise_view_user_info.xml | 3 +-
.../coding/program/user/MyDetailActivity.java | 6 +-
5 files changed, 80 insertions(+), 10 deletions(-)
diff --git a/app/src/enterprise/java/net/coding/program/user/EnterpriseLoginActivity.java b/app/src/enterprise/java/net/coding/program/user/EnterpriseLoginActivity.java
index 58bcdc91d..95c7d3d4e 100644
--- a/app/src/enterprise/java/net/coding/program/user/EnterpriseLoginActivity.java
+++ b/app/src/enterprise/java/net/coding/program/user/EnterpriseLoginActivity.java
@@ -128,7 +128,7 @@ protected void onCreate(Bundle savedInstanceState) {
@AfterViews
void init() {
- needCaptcha();
+// needCaptcha();
editName.addTextChangedListener(textWatcher);
editPassword.addTextChangedListener(textWatcher);
diff --git a/app/src/enterprise/java/net/coding/program/user/EnterpriseMyDetailActivity.java b/app/src/enterprise/java/net/coding/program/user/EnterpriseMyDetailActivity.java
index d2d649da1..6e6159b35 100644
--- a/app/src/enterprise/java/net/coding/program/user/EnterpriseMyDetailActivity.java
+++ b/app/src/enterprise/java/net/coding/program/user/EnterpriseMyDetailActivity.java
@@ -15,8 +15,7 @@
public class EnterpriseMyDetailActivity extends UserDetailCommonActivity {
public final int RESULT_EDIT = 0;
-
- private final String HOST_USER_INFO = Global.HOST_API + "/user/key/";
+ private final String TAG_HOST_USER_INFO = "TAG_HOST_USER_INFO";
@AfterViews
void initMyDetailActivity() {
@@ -29,12 +28,12 @@ void initMyDetailActivity() {
});
final String HOST_USER_INFO = Global.HOST_API + "/user/key/";
- getNetwork(HOST_USER_INFO + MyApp.sUserObject.global_key, HOST_USER_INFO);
+ getNetwork(HOST_USER_INFO + MyApp.sUserObject.global_key, TAG_HOST_USER_INFO);
}
@Override
public void parseJson(int code, JSONObject respanse, String tag, int pos, Object data) throws JSONException {
- if (tag.equals(HOST_USER_INFO)) {
+ if (tag.equals(TAG_HOST_USER_INFO)) {
if (code == 0) {
mUserObject = new UserObject(respanse.getJSONObject("data"));
bindUI(mUserObject);
diff --git a/app/src/enterprise/java/net/coding/program/user/EnterpriseUserDetailActivity.java b/app/src/enterprise/java/net/coding/program/user/EnterpriseUserDetailActivity.java
index 9519b942e..f99d05903 100644
--- a/app/src/enterprise/java/net/coding/program/user/EnterpriseUserDetailActivity.java
+++ b/app/src/enterprise/java/net/coding/program/user/EnterpriseUserDetailActivity.java
@@ -1,14 +1,84 @@
package net.coding.program.user;
+import android.view.View;
+import android.widget.TextView;
+
+import net.coding.program.MyApp;
import net.coding.program.R;
+import net.coding.program.common.Global;
+import net.coding.program.message.MessageListActivity_;
+import net.coding.program.model.UserObject;
+import org.androidannotations.annotations.AfterViews;
+import org.androidannotations.annotations.Click;
import org.androidannotations.annotations.EActivity;
import org.androidannotations.annotations.Extra;
+import org.androidannotations.annotations.ViewById;
+import org.json.JSONException;
+import org.json.JSONObject;
-@EActivity(R.layout.activity_user_detail)
+@EActivity(R.layout.enterprise_activity_my_detail)
public class EnterpriseUserDetailActivity extends UserDetailCommonActivity {
+ private final String TAG_HOST_USER_INFO = "TAG_HOST_USER_INFO";
+ private final String HOST_USER_INFO = Global.HOST_API + "/user/key/";
+
@Extra
String globalKey;
+ @ViewById
+ TextView moreDetail;
+
+ @AfterViews
+ void initEnterpriseUserDetailActivity() {
+ if (MyApp.sUserObject.global_key.equals(globalKey)) {
+ EnterpriseMyDetailActivity_.intent(this).start();
+ finish();
+ return;
+ }
+
+ getNetwork(HOST_USER_INFO + globalKey, TAG_HOST_USER_INFO);
+
+ }
+
+ @Click
+ void moreDetail() {
+ if (mUserObject == null) {
+ return;
+ }
+
+ UserDetailMoreActivity_.intent(this)
+ .mUserObject(mUserObject)
+ .start();
+ }
+
+ @Override
+ public void parseJson(int code, JSONObject respanse, String tag, int pos, Object data) throws JSONException {
+ if (tag.equals(TAG_HOST_USER_INFO)) {
+ if (code == 0) {
+ moreDetail.setVisibility(View.VISIBLE);
+ mUserObject = new UserObject(respanse.getJSONObject("data"));
+ bindUI(mUserObject);
+ } else {
+ showButtomToast("获取用户信息错误");
+ }
+ }
+ operActivenessResult(code, respanse, tag);
+ }
+
+ @Override
+ protected void bindUI(UserObject mUserObject) {
+ super.bindUI(mUserObject);
+ tv_follow_state.setText("发送私信");
+ tv_follow_state.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_private_letter, 0, 0, 0);
+ rl_follow_state.setOnClickListener(v -> {
+ MessageListActivity_.intent(v.getContext()).mGlobalKey(globalKey).start();
+ });
+ }
+
+ public int getActionBarSize() {
+ return Global.dpToPx(48);
+ }
+
+
}
diff --git a/app/src/enterprise/res/layout/enterprise_view_user_info.xml b/app/src/enterprise/res/layout/enterprise_view_user_info.xml
index bce188a21..e39db680d 100644
--- a/app/src/enterprise/res/layout/enterprise_view_user_info.xml
+++ b/app/src/enterprise/res/layout/enterprise_view_user_info.xml
@@ -101,6 +101,7 @@
Date: Fri, 6 Jan 2017 19:13:32 +0800
Subject: [PATCH 024/898] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E6=88=90=E5=91=98=E4=BF=AE=E6=94=B9=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/enterprise/AndroidManifest.xml | 5 +
.../net/coding/program/MyAppEnterprise.java | 5 +-
.../compatible/EnterpriseCompatImp.java | 12 ++
.../program/model/EnterpriseUserObject.java | 35 ++++
.../project/EnterpriseProjectFragment.java | 6 +-
.../EnterpriseMainSettingFragment.java | 2 +
.../user/EnterpriseAddMemberActivity.java | 197 ++++++++++++++++++
.../layout/activity_enterprise_add_member.xml | 33 +++
.../member_list_item_no_pick.png | Bin 0 -> 4188 bytes
.../mipmap-xxhdpi/member_list_item_picked.png | Bin 0 -> 4281 bytes
.../coding/program/common/TextWatcherAt.java | 1 +
.../compatible/ClassCompatInterface.java | 5 +
.../program/compatible/CodingCompat.java | 7 +
.../program/compatible/DefaultCompatImp.java | 11 +
.../program/maopao/MaopaoAddActivity.java | 1 +
.../maopao/share/CustomShareBoard.java | 1 +
.../program/message/MessageListActivity.java | 1 +
.../program/message/UsersListFragment.java | 8 +-
.../net/coding/program/model/AccountInfo.java | 12 --
.../project/PrivateProjectHomeFragment.java | 30 +++
.../project/detail/MembersListFragment.java | 12 +-
.../program/user/AddFollowActivity.java | 2 +-
app/src/main/res/values/strings.xml | 1 +
23 files changed, 358 insertions(+), 29 deletions(-)
create mode 100644 app/src/enterprise/java/net/coding/program/model/EnterpriseUserObject.java
create mode 100644 app/src/enterprise/java/net/coding/program/user/EnterpriseAddMemberActivity.java
create mode 100644 app/src/enterprise/res/layout/activity_enterprise_add_member.xml
create mode 100644 app/src/enterprise/res/mipmap-xxhdpi/member_list_item_no_pick.png
create mode 100644 app/src/enterprise/res/mipmap-xxhdpi/member_list_item_picked.png
diff --git a/app/src/enterprise/AndroidManifest.xml b/app/src/enterprise/AndroidManifest.xml
index 58be1ba80..b0300dca5 100755
--- a/app/src/enterprise/AndroidManifest.xml
+++ b/app/src/enterprise/AndroidManifest.xml
@@ -460,6 +460,11 @@
android:icon="@drawable/ic_lancher"
android:label="@string/title_activity_add_follow"
android:screenOrientation="portrait" />
+
pickGlobalKeys, int result) {
+ Intent intent = new Intent(fragment.getActivity(), EnterpriseAddMemberActivity_.class);
+ intent.putExtra("projectObject", projectObject);
+ intent.putExtra("pickedGlobalKeys", pickGlobalKeys);
+ fragment.startActivityForResult(intent, result);
+ }
}
diff --git a/app/src/enterprise/java/net/coding/program/model/EnterpriseUserObject.java b/app/src/enterprise/java/net/coding/program/model/EnterpriseUserObject.java
new file mode 100644
index 000000000..22575cd4a
--- /dev/null
+++ b/app/src/enterprise/java/net/coding/program/model/EnterpriseUserObject.java
@@ -0,0 +1,35 @@
+package net.coding.program.model;
+
+import org.json.JSONObject;
+
+import java.io.Serializable;
+
+/**
+ * Created by chenchao on 2017/1/6.
+ */
+
+public class EnterpriseUserObject implements Serializable {
+
+ private static final long serialVersionUID = 722208774167508837L;
+
+ public int createdat;
+ public int updatedat;
+ public int teamid;
+ public int userid;
+ public UserObject user;
+ public int role;
+ public String alias = "";
+ public String default2faMethod = "";
+
+ public EnterpriseUserObject(JSONObject json) {
+ createdat = json.optInt("created_at");
+ updatedat = json.optInt("updated_at");
+ teamid = json.optInt("team_id");
+ userid = json.optInt("user_id");
+ user = new UserObject(json.optJSONObject("user"));
+ role = json.optInt("role");
+ alias = json.optString("alias", "");
+ default2faMethod = json.optString("default2faMethod", "");
+ }
+
+}
diff --git a/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectFragment.java b/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectFragment.java
index 2412e7f05..941b5509a 100644
--- a/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectFragment.java
+++ b/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectFragment.java
@@ -20,7 +20,6 @@
import net.coding.program.common.ui.shadow.RecyclerViewSpace;
import net.coding.program.model.AccountInfo;
import net.coding.program.model.ProjectObject;
-import net.coding.program.project.detail.ProjectActivity;
import net.coding.program.project.init.InitProUtils;
import org.androidannotations.annotations.AfterViews;
@@ -101,8 +100,9 @@ private void onRefresh() {
Object object = v.getTag();
if (object instanceof ProjectObject) {
ProjectObject item = (ProjectObject) object;
- ProjectActivity.ProjectJumpParam param = new ProjectActivity.ProjectJumpParam(item.project_path);
- ProjectHomeActivity_.intent(this).mJumpParam(param).startForResult(InitProUtils.REQUEST_PRO_UPDATE);
+ ProjectHomeActivity_.intent(this)
+ .mProjectObject(item)
+ .startForResult(InitProUtils.REQUEST_PRO_UPDATE);
}
};
diff --git a/app/src/enterprise/java/net/coding/program/setting/EnterpriseMainSettingFragment.java b/app/src/enterprise/java/net/coding/program/setting/EnterpriseMainSettingFragment.java
index af306aca0..709519fae 100644
--- a/app/src/enterprise/java/net/coding/program/setting/EnterpriseMainSettingFragment.java
+++ b/app/src/enterprise/java/net/coding/program/setting/EnterpriseMainSettingFragment.java
@@ -36,6 +36,8 @@ void initEnterpriseMainSettingFragment() {
itemManager.setVisibility(visible);
itemManagerDivide.setVisibility(visible);
+
+ setHasOptionsMenu(false);
}
@Click
diff --git a/app/src/enterprise/java/net/coding/program/user/EnterpriseAddMemberActivity.java b/app/src/enterprise/java/net/coding/program/user/EnterpriseAddMemberActivity.java
new file mode 100644
index 000000000..a43002be5
--- /dev/null
+++ b/app/src/enterprise/java/net/coding/program/user/EnterpriseAddMemberActivity.java
@@ -0,0 +1,197 @@
+package net.coding.program.user;
+
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.loopj.android.http.RequestParams;
+
+import net.coding.program.R;
+import net.coding.program.common.Global;
+import net.coding.program.common.ui.BackActivity;
+import net.coding.program.common.umeng.UmengEvent;
+import net.coding.program.model.EnterpriseInfo;
+import net.coding.program.model.EnterpriseUserObject;
+import net.coding.program.model.ProjectObject;
+import net.coding.program.model.UserObject;
+import net.coding.program.model.project.ProjectServiceInfo;
+
+import org.androidannotations.annotations.AfterViews;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.Extra;
+import org.androidannotations.annotations.ViewById;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+
+@EActivity(R.layout.activity_enterprise_add_member)
+public class EnterpriseAddMemberActivity extends BackActivity {
+
+ private static final String TAG_HOST_MEMBERS = "TAG_HOST_MEMBERS";
+ private static final String TAG_SERVICE_INFO = "TAG_SERVICE_INFO";
+ private static final String TAG_HOST_ADD_USER = "TAG_HOST_ADD_USER";
+ private static final String TAG_HOST_DELETE_USER = "TAG_HOST_DELETE_USER";
+
+ ArrayList pickedData = new ArrayList<>();
+
+ @Extra
+ ProjectObject projectObject;
+
+ @Extra
+ ArrayList pickedGlobalKeys;
+
+ @ViewById
+ TextView maxUserCount;
+
+ @ViewById
+ ListView listView;
+
+ ArrayList listData = new ArrayList<>();
+
+ ProjectServiceInfo serviceInfo;
+
+ @AfterViews
+ void initEnterpriseAddMemberActivity() {
+ listView.setAdapter(adapter);
+ String host = String.format("%s/team/%s/members", Global.HOST_API, EnterpriseInfo.instance().getGlobalkey());
+ getNetwork(host, TAG_HOST_MEMBERS);
+ loadServiceInfo();
+ }
+
+ @Override
+ public void parseJson(int code, JSONObject respanse, String tag, int pos, Object data) throws JSONException {
+ if (tag.equals(TAG_HOST_MEMBERS)) {
+ if (code == 0) {
+ listData.clear();
+ JSONArray jsonArray = respanse.optJSONArray("data");
+ for (int i = 0; i < jsonArray.length(); ++i) {
+ EnterpriseUserObject user = new EnterpriseUserObject(jsonArray.optJSONObject(i));
+ listData.add(user.user);
+ }
+ for (String item : pickedGlobalKeys) {
+ for (UserObject user : listData) {
+ if (item.equals(user.global_key)) {
+ pickedData.add(user);
+ break;
+ }
+ }
+ }
+
+ adapter.notifyDataSetChanged();
+ }
+ } else if (tag.equals(TAG_HOST_ADD_USER)) {
+ if (code == 0) {
+ umengEvent(UmengEvent.PROJECT, "添加成员");
+
+ pickedData.add((UserObject) data);
+
+ showMiddleToast(String.format("添加项目成员 %s 成功", ((UserObject) data).name));
+ serviceInfo.member++;
+ AddFollowActivity.bindData(maxUserCount, serviceInfo);
+ } else {
+ showErrorMsg(code, respanse);
+ }
+ adapter.notifyDataSetChanged();
+
+ } else if (tag.equals(TAG_HOST_DELETE_USER)) {
+ if (code == 0) {
+ pickedData.remove((UserObject) data);
+
+ showMiddleToast(String.format("移除项目成员 %s 成功", ((UserObject) data).name));
+ serviceInfo.member--;
+ AddFollowActivity.bindData(maxUserCount, serviceInfo);
+ } else {
+ showErrorMsg(code, respanse);
+ }
+ adapter.notifyDataSetChanged();
+
+ } else if (tag.equals(TAG_SERVICE_INFO)) {
+ if (code == 0) {
+ serviceInfo = new ProjectServiceInfo(respanse.optJSONObject("data"));
+ AddFollowActivity.bindData(maxUserCount, serviceInfo);
+ } else {
+ showErrorMsg(code, respanse);
+ }
+ } else {
+ super.parseJson(code, respanse, tag, pos, data);
+ }
+ }
+
+ private void loadServiceInfo() {
+ final String url = projectObject.getHttpProjectApi() + "/service_info";
+ getNetwork(url, TAG_SERVICE_INFO);
+ }
+
+ private View.OnClickListener clickMutual = v -> {
+ UserObject user = (UserObject) v.getTag(R.id.followed);
+ if (((CheckBox) v).isChecked()) {
+ final String urlAddUser = Global.HOST_API + projectObject.getProjectPath() + "/members/gk/add";
+ RequestParams param = new RequestParams();
+ param.put("users", user.global_key);
+ postNetwork(urlAddUser, param, TAG_HOST_ADD_USER, -1, user);
+ } else {
+ final String urlDeleteUser = Global.HOST_API + "/project/%s/kickout/%s";
+ String url = String.format(urlDeleteUser, projectObject.getId(), user.id);
+ postNetwork(url, new RequestParams(), TAG_HOST_DELETE_USER, -1, user);
+ }
+ };
+
+ BaseAdapter adapter = new BaseAdapter() {
+ @Override
+ public int getCount() {
+ return listData.size();
+ }
+
+ @Override
+ public Object getItem(int position) {
+ return listData.get(position);
+ }
+
+ @Override
+ public long getItemId(int position) {
+ return position;
+ }
+
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ ViewHolder holder;
+ if (convertView == null) {
+ convertView = mInflater.inflate(R.layout.enterprise_add_member_list_item, parent, false);
+ holder = new ViewHolder();
+ holder.icon = (ImageView) convertView.findViewById(R.id.icon);
+ holder.name = (TextView) convertView.findViewById(R.id.name);
+ holder.mutual = (CheckBox) convertView.findViewById(R.id.followed);
+ holder.mutual.setVisibility(View.VISIBLE);
+ holder.mutual.setOnClickListener(clickMutual);
+
+ convertView.setTag(holder);
+ } else {
+ holder = (ViewHolder) convertView.getTag();
+ }
+
+ final UserObject data = (UserObject) getItem(position);
+ iconfromNetwork(holder.icon, data.avatar);
+ holder.name.setText(data.name);
+
+ boolean isPicked = pickedData.contains(data);
+ int drawableId = isPicked ? R.mipmap.member_list_item_picked : R.mipmap.member_list_item_no_pick;
+ holder.mutual.setButtonDrawable(drawableId);
+ holder.mutual.setChecked(isPicked);
+ holder.mutual.setTag(R.id.followed, data);
+
+ return convertView;
+ }
+ };
+
+ static class ViewHolder {
+ ImageView icon;
+ TextView name;
+ CheckBox mutual;
+ }
+}
diff --git a/app/src/enterprise/res/layout/activity_enterprise_add_member.xml b/app/src/enterprise/res/layout/activity_enterprise_add_member.xml
new file mode 100644
index 000000000..5d1ee3256
--- /dev/null
+++ b/app/src/enterprise/res/layout/activity_enterprise_add_member.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/enterprise/res/mipmap-xxhdpi/member_list_item_no_pick.png b/app/src/enterprise/res/mipmap-xxhdpi/member_list_item_no_pick.png
new file mode 100644
index 0000000000000000000000000000000000000000..bafd839f4ff99bba0938e91e7eb389aa2611deb5
GIT binary patch
literal 4188
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
ZUONklHGN=YGXEl2jP%TIRO!0J{vWSw7d!v}
literal 0
HcmV?d00001
diff --git a/app/src/main/java/net/coding/program/common/TextWatcherAt.java b/app/src/main/java/net/coding/program/common/TextWatcherAt.java
index 3cbcfb642..ae02b2912 100755
--- a/app/src/main/java/net/coding/program/common/TextWatcherAt.java
+++ b/app/src/main/java/net/coding/program/common/TextWatcherAt.java
@@ -46,6 +46,7 @@ private TextWatcherAt(Context mContext, StartActivity mStartActivity, int mResul
}
public static void startActivityAt(Context context, StartActivity startActivity, int result) {
+ // todo add 选人
Intent intent;
intent = new Intent(context, UsersListActivity_.class);
intent.putExtra("type", UsersListActivity.Friend.Follow);
diff --git a/app/src/main/java/net/coding/program/compatible/ClassCompatInterface.java b/app/src/main/java/net/coding/program/compatible/ClassCompatInterface.java
index 3e8d58195..6a0c5e9ec 100644
--- a/app/src/main/java/net/coding/program/compatible/ClassCompatInterface.java
+++ b/app/src/main/java/net/coding/program/compatible/ClassCompatInterface.java
@@ -5,6 +5,8 @@
import net.coding.program.model.ProjectObject;
+import java.util.ArrayList;
+
/**
* Created by chenchao on 2016/12/28.
* 用于抽象出 普通版 和 企业编 不同的地方
@@ -25,7 +27,10 @@ public interface ClassCompatInterface {
void launchMyDetailActivity(Context context);
void launchUserDetailActivity(Context context, String globalKey);
+
void launchUserDetailActivity(Context context, String globalKey, int result);
+
void launchUserDetailActivity(Fragment fragment, String globalKey, int result);
+ void launchAddMemberActivity(Fragment fragment, ProjectObject projectObject, ArrayList pickGlobalKeys, int result);
}
diff --git a/app/src/main/java/net/coding/program/compatible/CodingCompat.java b/app/src/main/java/net/coding/program/compatible/CodingCompat.java
index 9aa5f105e..e85c0e4c0 100644
--- a/app/src/main/java/net/coding/program/compatible/CodingCompat.java
+++ b/app/src/main/java/net/coding/program/compatible/CodingCompat.java
@@ -5,6 +5,8 @@
import net.coding.program.model.ProjectObject;
+import java.util.ArrayList;
+
/**
* Created by chenchao on 2016/12/28.
* 实现同 coding 普通版有差异的地方
@@ -68,5 +70,10 @@ public void launchUserDetailActivity(Context context, String globalKey, int resu
public void launchUserDetailActivity(Fragment fragment, String globalKey, int result) {
substance.launchUserDetailActivity(fragment, globalKey, result);
}
+
+ @Override
+ public void launchAddMemberActivity(Fragment fragment, ProjectObject projectObject, ArrayList pickGlobalKeys, int result) {
+ substance.launchAddMemberActivity(fragment, projectObject, pickGlobalKeys, result);
+ }
}
diff --git a/app/src/main/java/net/coding/program/compatible/DefaultCompatImp.java b/app/src/main/java/net/coding/program/compatible/DefaultCompatImp.java
index 79d4f21f7..dee7fc373 100644
--- a/app/src/main/java/net/coding/program/compatible/DefaultCompatImp.java
+++ b/app/src/main/java/net/coding/program/compatible/DefaultCompatImp.java
@@ -1,6 +1,7 @@
package net.coding.program.compatible;
import android.content.Context;
+import android.content.Intent;
import android.support.v4.app.Fragment;
import net.coding.program.LoginActivity_;
@@ -10,9 +11,12 @@
import net.coding.program.project.MainProjectFragment_;
import net.coding.program.project.PrivateProjectHomeFragment_;
import net.coding.program.project.PublicProjectHomeFragment_;
+import net.coding.program.user.AddFollowActivity_;
import net.coding.program.user.MyDetailActivity_;
import net.coding.program.user.UserDetailActivity_;
+import java.util.ArrayList;
+
/**
* Created by chenchao on 2016/12/29.
* coding
@@ -74,4 +78,11 @@ public void launchUserDetailActivity(Context context, String globalKey, int resu
public void launchUserDetailActivity(Fragment fragment, String globalKey, int result) {
UserDetailActivity_.intent(fragment).globalKey(globalKey).startForResult(result);
}
+
+ @Override
+ public void launchAddMemberActivity(Fragment fragment, ProjectObject projectObject, ArrayList pickGlobalKeys, int result) {
+ Intent intent = new Intent(fragment.getActivity(), AddFollowActivity_.class);
+ intent.putExtra("mProjectObject", projectObject);
+ fragment.startActivityForResult(intent, result);
+ }
}
diff --git a/app/src/main/java/net/coding/program/maopao/MaopaoAddActivity.java b/app/src/main/java/net/coding/program/maopao/MaopaoAddActivity.java
index 05633cad1..dee64e827 100755
--- a/app/src/main/java/net/coding/program/maopao/MaopaoAddActivity.java
+++ b/app/src/main/java/net/coding/program/maopao/MaopaoAddActivity.java
@@ -70,6 +70,7 @@
import java.io.Serializable;
import java.util.ArrayList;
+// // TODO: 2017/1/6 选图片的地方都需要先判断是否获取了存储权限
@EActivity(R.layout.activity_maopao_add)
public class MaopaoAddActivity extends BackActivity implements StartActivity, EmojiFragment.EnterEmojiLayout {
diff --git a/app/src/main/java/net/coding/program/maopao/share/CustomShareBoard.java b/app/src/main/java/net/coding/program/maopao/share/CustomShareBoard.java
index e8802ce2b..7c135076a 100644
--- a/app/src/main/java/net/coding/program/maopao/share/CustomShareBoard.java
+++ b/app/src/main/java/net/coding/program/maopao/share/CustomShareBoard.java
@@ -325,6 +325,7 @@ public void onClick(View v) {
case R.id.codingFriend:
umengEvent(UmengEvent.MAOPAO, "分享到好友");
+ // todo add 转发私信
UsersListActivity_.intent(mActivity)
.type(UsersListActivity.Friend.Follow)
.hideFollowButton(true)
diff --git a/app/src/main/java/net/coding/program/message/MessageListActivity.java b/app/src/main/java/net/coding/program/message/MessageListActivity.java
index 842d2ea1c..bee8553ed 100755
--- a/app/src/main/java/net/coding/program/message/MessageListActivity.java
+++ b/app/src/main/java/net/coding/program/message/MessageListActivity.java
@@ -430,6 +430,7 @@ public void onGlobalLayout() {
}
private void relayMessage(Message.MessageObject message) {
+ // // TODO add 转发私信
UsersListActivity_.intent(this)
.type(UsersListActivity.Friend.Follow)
.hideFollowButton(true)
diff --git a/app/src/main/java/net/coding/program/message/UsersListFragment.java b/app/src/main/java/net/coding/program/message/UsersListFragment.java
index c0b840b2b..acd5ec8a1 100755
--- a/app/src/main/java/net/coding/program/message/UsersListFragment.java
+++ b/app/src/main/java/net/coding/program/message/UsersListFragment.java
@@ -20,6 +20,7 @@
import net.coding.program.common.Global;
import net.coding.program.common.MyImageGetter;
import net.coding.program.common.StartActivity;
+import net.coding.program.common.TextWatcherAt;
import net.coding.program.common.Unread;
import net.coding.program.common.UnreadNotify;
import net.coding.program.common.network.RefreshBaseFragment;
@@ -27,7 +28,6 @@
import net.coding.program.model.Message;
import net.coding.program.model.UserObject;
import net.coding.program.user.UsersListActivity;
-import net.coding.program.user.UsersListActivity_;
import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.EFragment;
@@ -273,11 +273,7 @@ private void startNotifyListActivity(int type) {
@OptionsItem
void action_add() {
- UsersListActivity_.intent(this)
- .type(UsersListActivity.Friend.Follow)
- .selectType(true)
- .hideFollowButton(true)
- .startForResult(RESULT_SELECT_USER);
+ TextWatcherAt.startActivityAt(getActivity(), this, RESULT_SELECT_USER);
}
@OnActivityResult(RESULT_SELECT_USER)
diff --git a/app/src/main/java/net/coding/program/model/AccountInfo.java b/app/src/main/java/net/coding/program/model/AccountInfo.java
index ec1c868cd..be272838b 100755
--- a/app/src/main/java/net/coding/program/model/AccountInfo.java
+++ b/app/src/main/java/net/coding/program/model/AccountInfo.java
@@ -388,18 +388,6 @@ public static void setNeedPush(Context ctx, boolean push) {
editor.apply();
}
- public static String getEnterpriseName(Context ctx) {
- SharedPreferences sp = ctx.getSharedPreferences(ACCOUNT_SETTING, Context.MODE_PRIVATE);
- return sp.getString(KEY_ENTERPRISE, "");
- }
-
- public static void setEnterpriseName(Context ctx, String name) {
- SharedPreferences sp = ctx.getSharedPreferences(ACCOUNT_SETTING, Context.MODE_PRIVATE);
- SharedPreferences.Editor editor = sp.edit();
- editor.putString(KEY_ENTERPRISE, name);
- editor.apply();
- }
-
public static void setCheckLoginBackground(Context ctx) {
Calendar calendar = Calendar.getInstance();
SharedPreferences.Editor editor = ctx.getSharedPreferences(GLOBAL_SETTING, Context.MODE_PRIVATE).edit();
diff --git a/app/src/main/java/net/coding/program/project/PrivateProjectHomeFragment.java b/app/src/main/java/net/coding/program/project/PrivateProjectHomeFragment.java
index c8fd3ffc6..afd1ce4db 100644
--- a/app/src/main/java/net/coding/program/project/PrivateProjectHomeFragment.java
+++ b/app/src/main/java/net/coding/program/project/PrivateProjectHomeFragment.java
@@ -8,6 +8,7 @@
import net.coding.program.R;
import net.coding.program.common.Global;
import net.coding.program.common.RedPointTip;
+import net.coding.program.model.ProjectObject;
import net.coding.program.project.detail.ProjectActivity_;
import net.coding.program.project.detail.ProjectFunction;
import net.coding.program.project.maopao.ProjectMaopaoActivity_;
@@ -17,6 +18,8 @@
import org.androidannotations.annotations.OptionsItem;
import org.androidannotations.annotations.OptionsMenu;
import org.androidannotations.annotations.ViewById;
+import org.json.JSONException;
+import org.json.JSONObject;
@EFragment(R.layout.fragment_project_private)
@OptionsMenu(R.menu.menu_fragment_project_home)
@@ -25,6 +28,8 @@ public class PrivateProjectHomeFragment extends BaseProjectHomeFragment {
@ViewById
View codeLayout0, codeLayout1;
+ public static final String TAG_HOST_PROJECT = "TAG_HOST_PROJECT";
+
protected ProjectFunction[] getItems() {
return new ProjectFunction[] {
ProjectFunction.dynamic,
@@ -87,10 +92,22 @@ protected void initPrivateProjectHomeFragment() {
} else {
Global.setBadgeView((BadgeView) view.findViewById(R.id.badge), 0);
}
+
}
updateRedPoinitStyle();
+ bindUI();
+
+ if (needReload) {
+ getNetwork(mProjectObject.getHttpProjectObject(), TAG_HOST_PROJECT);
+ }
+
+ }
+
+ private void bindUI() {
+ Global.setBadgeView(dynamicBadge, mProjectObject.un_read_activities_count);
+
if (mProjectObject.canReadCode()) {
codeLayout0.setVisibility(View.VISIBLE);
codeLayout1.setVisibility(View.VISIBLE);
@@ -98,6 +115,19 @@ protected void initPrivateProjectHomeFragment() {
codeLayout0.setVisibility(View.GONE);
codeLayout1.setVisibility(View.GONE);
}
+
+ }
+
+ @Override
+ public void parseJson(int code, JSONObject respanse, String tag, int pos, Object data) throws JSONException {
+ if (tag.equals(TAG_HOST_PROJECT)) {
+ if (code == 0) {
+ mProjectObject = new ProjectObject(respanse.optJSONObject("data"));
+ bindUI();
+ }
+ } else {
+ super.parseJson(code, respanse, tag, pos, data);
+ }
}
void updateRedPoinitStyle() {
diff --git a/app/src/main/java/net/coding/program/project/detail/MembersListFragment.java b/app/src/main/java/net/coding/program/project/detail/MembersListFragment.java
index b5de671ca..330ad2e3e 100755
--- a/app/src/main/java/net/coding/program/project/detail/MembersListFragment.java
+++ b/app/src/main/java/net/coding/program/project/detail/MembersListFragment.java
@@ -32,7 +32,6 @@
import net.coding.program.model.UserObject;
import net.coding.program.project.ProjectFragment;
import net.coding.program.project.ProjectHomeActivity;
-import net.coding.program.user.AddFollowActivity_;
import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.EFragment;
@@ -63,7 +62,6 @@ public class MembersListFragment extends CustomMoreFragment implements FootUpdat
public enum Type {
Member,
Pick,
- Team
}
public enum DataType {
@@ -418,9 +416,13 @@ private boolean canManagerMember() {
@OptionsItem
void action_add() {
- Intent intent = new Intent(getActivity(), AddFollowActivity_.class);
- intent.putExtra("mProjectObject", mProjectObject);
- startActivityForResult(intent, RESULT_ADD_USER);
+ ArrayList picks = new ArrayList<>();
+ if (mSearchData != null && mSearchData.size() > 0 && mSearchData.get(0) instanceof TaskObject.Members) {
+ for (Object item : mSearchData) {
+ picks.add(((TaskObject.Members) item).user.global_key);
+ }
+ }
+ CodingCompat.instance().launchAddMemberActivity(this, mProjectObject, picks, RESULT_ADD_USER);
}
@OnActivityResult(RESULT_ADD_USER)
diff --git a/app/src/main/java/net/coding/program/user/AddFollowActivity.java b/app/src/main/java/net/coding/program/user/AddFollowActivity.java
index 6f5974019..fb9a19a43 100755
--- a/app/src/main/java/net/coding/program/user/AddFollowActivity.java
+++ b/app/src/main/java/net/coding/program/user/AddFollowActivity.java
@@ -277,7 +277,7 @@ public boolean onMenuItemActionCollapse(MenuItem item) {
return true;
}
- void search(String s) {
+ protected void search(String s) {
if (s == null || s.replaceAll(" ", "").replaceAll(" ", "").isEmpty()) {
if (mProjectObject != null) {
friendLayout.setVisibility(View.VISIBLE);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index da6263a32..3837e2907 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -35,6 +35,7 @@
话题墙
用户列表
添加关注
+ 添加成员
好友详情
消息
Hello blank fragment
From fe3627eca89e762fe13447c713a659429f279ccf Mon Sep 17 00:00:00 2001
From: 8206503 <8206503@qq.com>
Date: Fri, 6 Jan 2017 19:59:22 +0800
Subject: [PATCH 025/898] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E4=BA=86=E5=9B=BE?=
=?UTF-8?q?=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../project/EnterpriseProjectFragment.java | 19 ++++++++++++++++--
.../res/menu/enterprise_main_project.xml | 11 ++++++++--
.../drawable-xxhdpi/ic_menu_add_project.png | Bin 585 -> 954 bytes
.../res/drawable-xxhdpi/ic_menu_add_task.png | Bin 721 -> 1015 bytes
.../drawable-xxhdpi/ic_menu_add_task_2fa.png | Bin 1845 -> 2055 bytes
.../drawable-xxhdpi/ic_menu_send_message.png | Bin 0 -> 1762 bytes
6 files changed, 26 insertions(+), 4 deletions(-)
create mode 100644 app/src/main/res/drawable-xxhdpi/ic_menu_send_message.png
diff --git a/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectFragment.java b/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectFragment.java
index 941b5509a..55c27600f 100644
--- a/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectFragment.java
+++ b/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectFragment.java
@@ -13,14 +13,19 @@
import com.marshalchen.ultimaterecyclerview.quickAdapter.easyRegularAdapter;
import com.readystatesoftware.viewbadger.BadgeView;
+import net.coding.program.MyApp;
import net.coding.program.R;
import net.coding.program.common.Global;
import net.coding.program.common.ImageLoadTool;
+import net.coding.program.common.TextWatcherAt;
import net.coding.program.common.ui.BaseFragment;
import net.coding.program.common.ui.shadow.RecyclerViewSpace;
+import net.coding.program.common.util.PermissionUtil;
import net.coding.program.model.AccountInfo;
import net.coding.program.model.ProjectObject;
import net.coding.program.project.init.InitProUtils;
+import net.coding.program.project.init.create.ProjectCreateActivity_;
+import net.coding.program.task.add.TaskAddActivity_;
import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.EFragment;
@@ -190,16 +195,26 @@ public void loadMore() {
@OptionsItem
void actionCreateProject() {
-
+ ProjectCreateActivity_.intent(this).start();
}
@OptionsItem
void actionCreateTask() {
-
+ TaskAddActivity_.intent(this).mUserOwner(MyApp.sUserObject).start();
}
@OptionsItem
void actionSendMessage() {
+ TextWatcherAt.startActivityAt(getActivity(), this, 0);
+ }
+
+ @OptionsItem
+ void action2fa() {
+ if (!PermissionUtil.checkCamera(getActivity())) {
+ return;
+ }
+
+ Global.start2FAActivity(getActivity());
}
protected class ProjectAdapter extends easyRegularAdapter {
diff --git a/app/src/enterprise/res/menu/enterprise_main_project.xml b/app/src/enterprise/res/menu/enterprise_main_project.xml
index dd05ec58c..3c303c92e 100644
--- a/app/src/enterprise/res/menu/enterprise_main_project.xml
+++ b/app/src/enterprise/res/menu/enterprise_main_project.xml
@@ -32,10 +32,17 @@
android:icon="@drawable/ic_menu_add_task"
android:title="创建任务"
app:showAsAction="always" />
+
- 全部
+ - 任务
+ - 文件
+ - 代码
+ - 其它
+
+
+
+ - all
+ - task
+ - file
+ - code
+ - other
+
+
+
diff --git a/app/src/main/java/net/coding/program/UserDetailEditActivity.java b/app/src/main/java/net/coding/program/UserDetailEditActivity.java
index fcbd2c0ad..a8841e732 100755
--- a/app/src/main/java/net/coding/program/UserDetailEditActivity.java
+++ b/app/src/main/java/net/coding/program/UserDetailEditActivity.java
@@ -229,7 +229,7 @@ protected final void initUserDetailEditActivity() {
listViewAddFootSection(listView);
user = AccountInfo.loadAccount(this);
- View head = mInflater.inflate(R.layout.activity_user_info_head, null, false);
+ View head = mInflater.inflate(R.layout.activity_user_info_head, listView, false);
icon = (ImageView) head.findViewById(R.id.icon);
icon.setOnClickListener(new ClickSmallImage(this));
iconfromNetwork(icon, user.avatar);
diff --git a/app/src/main/java/net/coding/program/common/base/MDEditFragment.java b/app/src/main/java/net/coding/program/common/base/MDEditFragment.java
index 6ac736a60..86d4f7d3c 100644
--- a/app/src/main/java/net/coding/program/common/base/MDEditFragment.java
+++ b/app/src/main/java/net/coding/program/common/base/MDEditFragment.java
@@ -2,7 +2,6 @@
import android.app.Activity;
-import android.content.DialogInterface;
import android.content.Intent;
import android.net.Uri;
import android.provider.MediaStore;
@@ -19,6 +18,7 @@
import net.coding.program.common.PhotoOperate;
import net.coding.program.common.photopick.CameraPhotoUtil;
import net.coding.program.common.ui.BaseFragment;
+import net.coding.program.common.util.PermissionUtil;
import net.coding.program.model.AttachmentFileObject;
import net.coding.program.project.detail.TopicEditFragment;
@@ -122,16 +122,21 @@ public void mdDivide(View v) {
@Click
public void mdPhoto(View v) {
+ if (!PermissionUtil.writeExtralStorage(getActivity())) {
+ return;
+ }
+
+ popPickDialog();
+ }
+
+ private void popPickDialog() {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setTitle("上传图片")
- .setItems(R.array.camera_gallery, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- if (which == 0) {
- camera();
- } else {
- photo();
- }
+ .setItems(R.array.camera_gallery, (dialog, which) -> {
+ if (which == 0) {
+ camera();
+ } else {
+ photo();
}
}).show();
}
diff --git a/app/src/main/java/net/coding/program/common/ui/BaseFragment.java b/app/src/main/java/net/coding/program/common/ui/BaseFragment.java
index 6a3559c5e..180ff7c3d 100755
--- a/app/src/main/java/net/coding/program/common/ui/BaseFragment.java
+++ b/app/src/main/java/net/coding/program/common/ui/BaseFragment.java
@@ -1,22 +1,27 @@
package net.coding.program.common.ui;
+import android.Manifest;
import android.app.Activity;
import android.app.ProgressDialog;
import android.content.DialogInterface;
+import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Bundle;
import android.support.design.widget.AppBarLayout;
+import android.support.v4.app.ActivityCompat;
import android.support.v4.view.ViewCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
+import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
+import android.widget.Toast;
import com.loopj.android.http.RequestParams;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
@@ -29,12 +34,16 @@
import net.coding.program.common.network.NetworkCallback;
import net.coding.program.common.network.NetworkImpl;
import net.coding.program.common.network.UmengFragment;
+import net.coding.program.common.util.PermissionUtil;
import net.coding.program.common.util.SingleToast;
import net.coding.program.compatible.CodingCompat;
import org.json.JSONException;
import org.json.JSONObject;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Created by cc191954 on 14-8-11.
* 封装了图片下载
@@ -199,6 +208,45 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
return super.onCreateView(inflater, container, savedInstanceState);
}
+ protected boolean writeExtralStorage() {
+ final String[] PERMISSION_STORAGE = new String[]{
+ Manifest.permission.READ_EXTERNAL_STORAGE,
+ Manifest.permission.WRITE_EXTERNAL_STORAGE,
+ Manifest.permission.CAMERA
+ };
+ return checkPermission(PermissionUtil.RESULT_CAMERA_STORAGE, PERMISSION_STORAGE);
+ }
+
+ protected boolean checkPermission(int result, String[] permission) {
+ return checkPermission(result, permission, "");
+ }
+
+ protected boolean checkPermission(int result, String[] permission, String tipString) {
+ List needApply = new ArrayList<>();
+ for (String item : permission) {
+ if (ActivityCompat.checkSelfPermission(getActivity(), item) != PackageManager.PERMISSION_GRANTED) {
+ needApply.add(item);
+ }
+ }
+
+ if (needApply.isEmpty()) {
+ return true;
+ }
+
+ String[] applys = new String[needApply.size()];
+ applys = needApply.toArray(applys);
+
+ if (!TextUtils.isEmpty(tipString)) {
+ Toast.makeText(getActivity(), tipString, Toast.LENGTH_SHORT).show();
+ }
+ requestPermissions(
+ applys,
+ result
+ );
+
+ return false;
+ }
+
@Override
public void parseJson(int code, JSONObject respanse, String tag, int pos, Object data) throws JSONException {
}
diff --git a/app/src/main/java/net/coding/program/common/util/PermissionUtil.java b/app/src/main/java/net/coding/program/common/util/PermissionUtil.java
index c5355e127..4a668e1ea 100644
--- a/app/src/main/java/net/coding/program/common/util/PermissionUtil.java
+++ b/app/src/main/java/net/coding/program/common/util/PermissionUtil.java
@@ -14,42 +14,46 @@
* 检查权限
*/
public class PermissionUtil {
+
+ public static final int RESULT_CAMERA = 2002;
+ public static final int RESULT_MICROPHONE = 2003;
+ public static final int RESULT_LOCATION = 2004;
+ public static final int RESULT_STORAGE = 2001;
+ public static final int RESULT_CAMERA_STORAGE = 2005;
+
+ public static final String[] PERMISSION_STORAGE = new String[]{
+ Manifest.permission.READ_EXTERNAL_STORAGE,
+ Manifest.permission.WRITE_EXTERNAL_STORAGE
+ };
+
public static boolean writeExtralStorage(Activity activity) {
- final int result = 2001;
- final String[] permission = {
- Manifest.permission.READ_EXTERNAL_STORAGE,
- Manifest.permission.WRITE_EXTERNAL_STORAGE
- };
- return checkPermission(activity, result, permission, "开启存储空间权限后才能下载");
+ return checkPermission(activity, RESULT_STORAGE, PERMISSION_STORAGE, "开启存储空间权限后才能下载");
}
public static boolean checkCamera(Activity activity) {
- final int result = 2002;
final String[] permission = {
Manifest.permission.CAMERA
};
- return checkPermission(activity, result, permission, "开启相机权限后才能使用");
+ return checkPermission(activity, RESULT_CAMERA, permission, "开启相机权限后才能使用");
}
public static boolean checkMicrophone(Activity activity) {
- final int result = 2003;
final String[] permission = {
Manifest.permission.RECORD_AUDIO
};
- return checkPermission(activity, result, permission, "开启麦克风权限后才能使用");
+ return checkPermission(activity, RESULT_MICROPHONE, permission, "开启麦克风权限后才能使用");
}
public static boolean checkLocation(Activity activity) {
- final int result = 2004;
final String[] permission = {
Manifest.permission.ACCESS_FINE_LOCATION,
Manifest.permission.ACCESS_COARSE_LOCATION
};
- return checkPermission(activity, result, permission, "开启位置信息权限后才能使用");
+ return checkPermission(activity, RESULT_LOCATION, permission, "开启位置信息权限后才能使用");
}
private static boolean checkPermission(Activity activity, int result, String[] permission, String tipString) {
diff --git a/app/src/main/res/layout/activity_user_detail_edit.xml b/app/src/main/res/layout/activity_user_detail_edit.xml
index dabe9dfbe..dccbc8709 100755
--- a/app/src/main/res/layout/activity_user_detail_edit.xml
+++ b/app/src/main/res/layout/activity_user_detail_edit.xml
@@ -9,6 +9,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:divider="@color/divide_line"
+ android:background="@color/stand_bg"
android:dividerHeight="0.5dp" />
diff --git a/app/src/main/res/layout/activity_user_info_head.xml b/app/src/main/res/layout/activity_user_info_head.xml
index e49c57bbc..e04b5f157 100755
--- a/app/src/main/res/layout/activity_user_info_head.xml
+++ b/app/src/main/res/layout/activity_user_info_head.xml
@@ -13,7 +13,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
- android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textSize="16sp"
+ android:textColor="@color/font_2"
android:text="头像" />
@color/font_6
- @drawable/color_primary
+ - @color/font_green
From 6fafe456f06a19bbe1234685746697b8538f45fa Mon Sep 17 00:00:00 2001
From: 8206503 <8206503@qq.com>
Date: Sat, 7 Jan 2017 16:47:01 +0800
Subject: [PATCH 032/898] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B3=E4=BA=8E?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../icon_user_monkey_circle.png | Bin 0 -> 22910 bytes
.../enterprise/res/layout/activity_about.xml | 80 +++++++++++-------
app/src/main/res/layout/activity_about.xml | 11 ++-
3 files changed, 56 insertions(+), 35 deletions(-)
create mode 100644 app/src/enterprise/res/drawable-xxhdpi/icon_user_monkey_circle.png
diff --git a/app/src/enterprise/res/drawable-xxhdpi/icon_user_monkey_circle.png b/app/src/enterprise/res/drawable-xxhdpi/icon_user_monkey_circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4c840d2752ebede57b5056cbd7e462469652b53
GIT binary patch
literal 22910
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