Skip to content

Commit c3641f3

Browse files
thinaaronthinaaron
committed
企业版主页改版，与平台版一致
1 parent a47136b commit c3641f3

16 files changed

Lines changed: 452 additions & 126 deletions

‎app/build.gradle‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ android {
5151
abortOnError false
5252
}
5353
}
54-
flavorDimensions "mode", "version"
54+
flavorDimensions "mode"
5555
productFlavors {
5656

5757
// 版本号不能放在
@@ -63,12 +63,13 @@ android {
6363
targetSdkVersion 23
6464

6565
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
66+
signingConfig signingConfigs.config
6667
}
6768
enterprise {
6869
dimension "mode"
6970
applicationId "net.coding.program.enterprise"
70-
versionCode 280
71-
versionName "2.8"
71+
versionCode 290
72+
versionName "2.9"
7273
targetSdkVersion 21
7374

7475
// 信鸽依赖
@@ -81,17 +82,6 @@ android {
8182
XG_ACCESS_ID : "2100249649",
8283
XG_ACCESS_KEY: "AE6DQ4C5G35G",
8384
]
84-
}
85-
86-
dev {
87-
dimension "version"
88-
signingConfig signingConfigs.config
89-
90-
}
91-
92-
prod {
93-
dimension "version"
94-
minSdkVersion 15
9585
signingConfig signingConfigs.config
9686
}
9787
}

‎app/src/enterprise/java/net/coding/program/compatible/EnterpriseCompatImp.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,13 @@ public void launchProjectMaopao(Fragment fragment, ProjectObject projectObject)
111111
.start();
112112
}
113113

114+
@Override
115+
public void launchProjectMaopao(Activity fragment, ProjectObject projectObject) {
116+
EnterpriseProjectMaopaoActivity_.intent(fragment)
117+
.projectObject(projectObject)
118+
.start();
119+
}
120+
114121
@Override
115122
public void launchPickUser(Activity activity, String relayString) {
116123
PickUserRelayMessageActivity_.intent(activity)
@@ -143,4 +150,5 @@ public void launchProjectMaopoaList(Context context, ProjectJumpParam param) {
143150
public void launchSetGKActivity(Context context) {
144151
// 跳转到设置 GK 界面，企业版没有这个界面
145152
}
153+
146154
}

‎app/src/enterprise/java/net/coding/program/project/EnterpriseProjectHomeFragment.java‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package net.coding.program.project;
22

3-
import android.view.View;
4-
53
import net.coding.program.R;
6-
import net.coding.program.common.model.EnterpriseInfo;
74
import net.coding.program.project.detail.ProjectFunction;
85

96
import org.androidannotations.annotations.EFragment;
@@ -16,24 +13,24 @@ protected ProjectFunction[] getItems() {
1613
return new ProjectFunction[]{
1714
ProjectFunction.dynamic,
1815
ProjectFunction.task,
16+
ProjectFunction.taskBoard,
1917
ProjectFunction.wiki,
2018
ProjectFunction.document,
2119
ProjectFunction.code,
22-
ProjectFunction.member,
2320
ProjectFunction.branchManage,
2421
ProjectFunction.releaseManage,
2522
ProjectFunction.merge,
26-
ProjectFunction.git
23+
ProjectFunction.git,
2724
};
2825
}
2926

30-
@Override
31-
protected void initProjectSettingEntrance(View view) {
32-
if (EnterpriseInfo.instance().canManagerEnterprise() || mProjectObject.canManagerMember()) { // 所有者可以直接修改项目
33-
view.findViewById(R.id.projectHeaderLayout).setOnClickListener(clickProjectSetting);
34-
} else {
35-
super.initProjectSettingEntrance(view);
36-
}
37-
}
27+
// @Override
28+
// protected void initProjectSettingEntrance(View view) {
29+
// if (EnterpriseInfo.instance().canManagerEnterprise() || mProjectObject.canManagerMember()) { // 所有者可以直接修改项目
30+
// view.findViewById(R.id.projectHeaderLayout).setOnClickListener(clickProjectSetting);
31+
// } else {
32+
// super.initProjectSettingEntrance(view);
33+
// }
34+
// }
3835

3936
}

‎app/src/enterprise/java/net/coding/program/project/maopao/EnterpriseProjectMaopaoAdapter.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
8181
holder.name.setText(data.owner.name);
8282
holder.time.setText(Global.getTimeDetail(data.created_at));
8383
holder.content.setText(GlobalCommon.changeHyperlinkColor(data.content.replace("<p>", "").replace("</p>", "").replace("</blockquote>", "").replace("<blockquote>", "")));
84-
holder.delete.setTag(data);
85-
if (data.owner_id == GlobalData.sUserObject.id) {
86-
holder.delete.setVisibility(View.VISIBLE);
87-
} else {
88-
holder.delete.setVisibility(View.INVISIBLE);
89-
}
84+
9085

9186
holder.contentArea.setData(data);
9287

@@ -104,16 +99,13 @@ public ViewHolder(View v) {
10499
name = (TextView) v.findViewById(R.id.name);
105100
time = (TextView) v.findViewById(R.id.time);
106101
content = (TextView) v.findViewById(R.id.content);
107-
delete = v.findViewById(R.id.delete);
108-
delete.setOnClickListener(clickDelete);
109102
contentArea = new ContentArea(v, clickListItem, onClickImage, myImageGetter, imageLoadTool, mPxImageWidth);
110103
}
111104

112105
ImageView icon;
113106
TextView name;
114107
TextView time;
115108
TextView content;
116-
View delete;
117109

118110
ContentArea contentArea;
119111
}

‎app/src/enterprise/java/net/coding/program/user/EnterpriseLoginActivity.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import net.coding.program.common.GlobalCommon;
3030
import net.coding.program.common.GlobalData;
3131
import net.coding.program.common.SimpleSHA1;
32+
import net.coding.program.common.event.EventLoginSuccess;
3233
import net.coding.program.common.model.AccountInfo;
3334
import net.coding.program.common.model.EnterpriseDetail;
3435
import net.coding.program.common.model.EnterpriseInfo;
@@ -41,7 +42,6 @@
4142
import net.coding.program.common.widget.LoginEditTextNew;
4243
import net.coding.program.common.widget.input.SimpleTextWatcher;
4344
import net.coding.program.compatible.CodingCompat;
44-
import net.coding.program.guide.GuideActivity;
4545
import net.coding.program.login.PhoneRegisterActivity_;
4646
import net.coding.program.login.auth.AuthInfo;
4747
import net.coding.program.login.auth.TotpClock;
@@ -218,7 +218,7 @@ void register() {
218218
@OnActivityResult(RESULT_CLOSE)
219219
void resultRegiter(int result) {
220220
if (result == Activity.RESULT_OK) {
221-
sendBroadcast(new Intent(GuideActivity.BROADCAST_GUIDE_ACTIVITY));
221+
EventLoginSuccess.Companion.sendMessage();
222222
finish();
223223
}
224224
}
@@ -456,7 +456,7 @@ private void jumpMainActivity() throws JSONException {
456456
String companyName = enterpriseEdit.getText().toString();
457457
AccountInfo.saveLastCompanyName(this, companyName);
458458

459-
sendBroadcast(new Intent(GuideActivity.BROADCAST_GUIDE_ACTIVITY));
459+
EventLoginSuccess.Companion.sendMessage();
460460
finish();
461461
startActivity(new Intent(this, CodingCompat.instance().getMainActivity()));
462462
}

‎app/src/enterprise/res/layout/activity_about.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,11 @@
117117
style="@style/aboutBottomText"
118118
android:text="联系电话：400-930-9163" />
119119

120+
<TextView
121+
android:id="@+id/qq"
122+
style="@style/aboutBottomText"
123+
android:text="QQ：2847276903" />
124+
120125
<TextView
121126
android:id="@+id/email"
122127
style="@style/aboutBottomText"

0 commit comments

Comments
 (0)